gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,081 Commits 12 Branches 481 Tags 2.4 GiB
ca2a964e45
Commit Graph

147 Commits

Author SHA1 Message Date
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