gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,867 Commits 12 Branches 481 Tags 2.4 GiB
3bdf520bcb
Commit Graph

202 Commits

Author SHA1 Message Date
Madhura Jayaratne
3e77c708b4 Check whether query succeeded 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:02:38 +05:30
Madhura Jayaratne
865eb0cda6 Another instance of loose comparing fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 17:54:20 +05:30
Madhura Jayaratne
f05f535210 Scrutinizer does not like loose comparing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 17:52:51 +05:30
Madhura Jayaratne
f6e0d94f1a _dbgQuery also accepts false 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 17:41:37 +05:30
Madhura Jayaratne
f3b7d693ec bug #4814 MySQL 5.7.6 and Databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 09:21:29 +05:30
Madhura Jayaratne
a07548273f Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-25 21:29:19 +05:30
Madhura Jayaratne
209f9c6de7 bug #4778 SQL error when database list is sorted by additional columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-25 21:25:07 +05:30
Madhura Jayaratne
2e0167b079 Update return types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:16:13 +05:30
Madhura Jayaratne
8a2b870b04 Empty string makes more sense as the default value for table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:05:31 +05:30
Madhura Jayaratne
76e3ec78c2 rfe #1179 Speed up slow triggers by using EVENT_OBJECT_SCHEMA 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-06 11:24:02 +05:30
Madhura Jayaratne
2eab3b5880 bug #4727 Collation column missing in database list when DisableIS is true 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 17:31:03 +05:30
Marc Delisle
27540ea81a Bug Undefined constant PMA_DRIZZLE 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-18 06:36:23 -05:00
Marc Delisle
a41ddf562e Bug Null argument in array_multisort() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-11 05:50:17 -05:00
Madhura Jayaratne
0bca6a096f Determine the databases the user has access to based on GRANTs and query only for them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 08:13:58 +05:30
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
026c31fab6 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:59:19 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:52:20 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
b58f072c75 Fix parameter type warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-24 14:25:21 -04:00
Ann + J.M
953e865fc6 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:44:50 +02:00
Marc Delisle
dde9ca7c79 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:38:46 -04:00
Madhura Jayaratne
bd68c54d1b bug #4562 [security] XSS in debug SQL output 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 08:42:02 +05:30
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Madhura Jayaratne
a87294fbe4 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 08:28:05 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Madhura Jayaratne
3c2f85774e Initialize the array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-16 17:52:23 +05:30
Madhura Jayaratne
492d0f133f Additional fix for bug #3869. Consider tables in information_schema as views to benefit from 'MaxExactCountViews' and avoid count(*) in information_schema tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-16 14:59:45 +05:30
Madhura Jayaratne
6031f7a0bc Remove outdated comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 10:58:46 +05:30
Madhura Jayaratne
771847102f SHOW GRANTS based privilege checking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 10:55:33 +05:30
Madhura Jayaratne
6ebca5a49d Fix privilege checking queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 07:43:59 +05:30
Madhura Jayaratne
3e3e46fa27 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:10 +05:30
Madhura Jayaratne
adde777639 Revert "The DisableIS directive is being deprecated" 
This reverts commit b0962e8fd8.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:51 +05:30
Madhura Jayaratne
19432a02cc Revert "The DisableIS directive is being deprecated" 
This reverts commit 3065a3edcf.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:45 +05:30
Madhura Jayaratne
2c188c0109 Revert "The DisableIS directive is being deprecated" 
This reverts commit 60938c67fa.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:23 +05:30
Madhura Jayaratne
5cb87ecf30 Revert "The DisableIS directive is being deprecated" 
This reverts commit 4905240aed.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:17 +05:30
Madhura Jayaratne
380e8940b1 bug #4552 Incorrect routines display for database due to case insensitive checks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:27:09 +05:30
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-03 23:08:43 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
b4b506af2f Coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 16:14:32 +02:00
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Hugues Peccatte
570ca18011 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-19 17:23:41 +02:00
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Tim Siebels
d9cbf2664c Fix default port to null for hhvm 
HHVM doesn't allow false to be passed as port to mysqli_real_connect.
It only allows a nullable integer until ZendParamMode is finished.

See facebook/hhvm#1817

Signed-off-by: Tim Siebels <tim_siebels_aurich@yahoo.de>
 2014-07-24 17:54:21 +02:00
Chirayu Chiripal
04a3a7073b RFE-1488/781: User privilege tab not shown in all relevant cases 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-18 00:13:08 +05:30
Isaac Bennetch
175c1a786a Merge pull request #1276 from D-storm/FR-637 
RFE-637: Custom field handlers (input transformations)
 2014-07-12 09:45:35 -04:00
Marc Delisle
a9296005c1 Improve variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-12 07:25:47 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Marc Delisle
f20ac45096 Ensure variable is a string 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-11 07:28:52 -04:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Michal Čihař
ddac366fd6 Merge remote-tracking branch 'origin/QA_4_2' 
Conflicts:
	libraries/DatabaseInterface.class.php
 2014-06-12 13:37:35 +02:00
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-12 16:55:27 +05:30
Michal Čihař
4c328aaf03 Remove workaround for older MySQL versions 
Remove workaround originally implemented for MySQL < 5.0.2, but also
useful in 5.1.x times for listing tables within database when
permissions on one of database directories are wrong.

I've tested this with several MySQL versions and it does not seem to be
needed now, the INFORMATION SCHEMA works correctly even if some of the
database directories have wrong permissions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:14 +02:00
Michal Čihař
dbd18940be Remove explicit unsetting of local variables 
This was useful in global scope, but makes no sense when used inside
method as all it's variables are cleaned up anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
697cbf22d5 Simplify code 
foreach on empty list does nothing, so we can skip the initial
condition.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
ecfcba84f1 Correct parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:26:08 +02:00
Michal Čihař
54564305b6 Query options are integer (and are so handled in other methods) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:59:22 +02:00
Madhura Jayaratne
3c21181678 Remove extra empty line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 18:19:30 +05:30
Michal Čihař
d6a3abcf81 Fix method call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 12:54:21 +02:00
Michal Čihař
cbac30c99a Document that fetchResult can take array 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:34:38 +02:00
Michal Čihař
de7255f120 Share code for generating JOIN query for Drizlle 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:32:17 +02:00
Michal Čihař
7bc9eba9bc One place to generate KILL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:08:40 +02:00
Michal Čihař
1beb22fddc Merge pull request #1205 from duncan3dc/amazon_rds 
Allow processes to be killed on Amazon RDS
 2014-06-05 22:36:35 +02:00
Craig Duncan
17fd6b576a Dynamically detect an amazon rds instance 
This is to avoid more configuration options

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2014-06-05 19:38:57 +01:00
Michal Čihař
1ca50ed73e Adjust comment as this returns bool 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-04 10:15:20 +02:00
Madhura Jayaratne
839094612a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:00:26 +02:00
Michal Čihař
b1915bade0 The storeResult needs mysqli lin parameter to operate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:29:56 +02:00
Michal Čihař
cb6b37f19d Remove extra spaces 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:57:45 +02:00
Michal Čihař
38febf6daf Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
53eca3b2cb Share code for backtrace formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
b3700d3450 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:18:06 +02:00
Michal Čihař
a2d5c59a72 Correct type annontation for DBI 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:08:58 +02:00
Michal Čihař
09e15add26 Move getting link to the wrapper class so that the drivers always get right link parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 12:36:59 +02:00
Michal Čihař
5f4c3b841e Share code in DBI->fetchResult 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 12:16:00 +02:00
Michal Čihař
67965902ad Let getLink detect when userlink is null 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:30:03 +02:00
Michal Čihař
3690415c70 Share code for getting mysql link object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:09:39 +02:00
Michal Čihař
c249246e10 Share code for caching affected rows 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:03:12 +02:00
Michal Čihař
2f312320f7 Move require to the correct place 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:42:59 +02:00
Michal Čihař
e2f9431501 Pass correct parameter to postConnect 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:23:45 +02:00
Michal Čihař
1273c3349c Return null for not set socket 
This is correct value for unset socket.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:19:03 +02:00
Michal Čihař
d9f44a64bf Oops, another typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:16:01 +02:00
Michal Čihař
79bc9ea150 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:15:09 +02:00
Michal Čihař
b82e706dcb Share post connect code between DBIs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:12:55 +02:00
Michal Čihař
9e8505ff5e Factor out socket/port parsing for connecting database 
Almost same code was used in three DBIs, so let's share it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:01:35 +02:00
Michal Čihař
4443209707 Do not call DBI->postConnect for control link 
It used to just return, so there is no sense in calling it at all.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:41:56 +02:00
Michal Čihař
69a9cb1e58 Share logic for calling postConnect method 
This should be called on success, when we're creating primary
connection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:41:56 +02:00
Michal Čihař
510825c97e Share implementation of insertId among DBIs 
There is no need to have the method implemented three times.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:21:11 +02:00
Hugues Peccatte
5306fcc9c6 Minor coding style fixes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-08 21:51:24 +02:00
Michal Čihař
eb29ddeba8 Remove never used parameter of cacheSet 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
283ee59316 Remove never used parameter of cacheExists 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
79bcd54610 Remove never used parameter of cacheGet 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
8a731a80cb Do not hardcode mysqli in the interface library 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
dc0905a0c4 Check whether we got valid result before trying to use it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:03:40 +02:00
Michal Čihař
c869983f11 Remove unused support for fetchResult getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:28:49 +02:00
Michal Čihař
98c7ac94db Remove unused support for fetchSingleRow getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:27:07 +02:00
Michal Čihař
862541d000 Remove unused support for fetchValue getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:24:27 +02:00
Michal Čihař
e47566f9fd Fix code docblocks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:22:21 +02:00
Hugues Peccatte
9d059ee7a8 Minor PHPCS corrections. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-01 17:30:13 +01:00
Marc Delisle
964ea23fa0 Unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-27 09:17:36 -05:00