gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,409 Commits 12 Branches 481 Tags 2.4 GiB
714ab04d51
Commit Graph

172 Commits

Author SHA1 Message Date
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
Marc Delisle
2df3184d3a Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-26 09:25:31 -05:00
Marc Delisle
3d72b1cc87 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-24 08:24:14 -05:00
Marc Delisle
2881877f87 Refactor: new _cacheTableData() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-18 07:58:58 -05:00
Marc Delisle
5a64dfe092 Refactor: new _getSqlForTablesFull() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-13 10:40:44 -05:00
Chanaka Indrajith
d2bb285390 Fixed long line 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-01-11 22:59:55 +05:30
Marc Delisle
3e011150fd Refactor: new _getTableCondition() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-10 08:47:22 -05:00
Marc Delisle
f1bc750a88 Merge branch 'QA_4_1' 2014-01-09 08:11:51 -05:00
Madhura Jayaratne
09b0f9e60f bug #4224 Empty table names when a table is "inuse" 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-09 16:58:46 +05:30
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Marc Delisle
e8b9296a78 Merge branch 'QA_4_1' 2014-01-07 08:42:01 -05:00
Ben Walter
fb4ba11d14 bug #4215 MariaDB 5.5: error in Drizzle detection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-07 08:22:51 -05:00
Hugues Peccatte
8665639bb0 Review of modifications 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-05 11:05:32 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables. 
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-04 20:46:18 +01:00
Madhura Jayaratne
53c72f42cb Merge branch 'QA_4_1' 2014-01-04 15:10:39 +05:30
Madhura Jayaratne
8bab3325b3 Size = Data_length + Index_length 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-04 15:00:01 +05:30
Hugues Peccatte
37f90df60d Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:52 +01:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 22:13:10 +01:00
Marc Delisle
f7b99962bb bug #2983 unknown table status: TABLE_TYPE 2013-11-14 09:21:22 -05:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Marc Delisle
4905240aed The DisableIS directive is being deprecated 2013-11-03 07:00:00 -05:00
Marc Delisle
60938c67fa The DisableIS directive is being deprecated 2013-11-03 06:27:02 -05:00
Marc Delisle
3065a3edcf The DisableIS directive is being deprecated 2013-11-01 12:49:54 -04:00
Marc Delisle
b0962e8fd8 The DisableIS directive is being deprecated 2013-11-01 08:24:54 -04:00
Marc Delisle
d2b697ec02 Fix typo 2013-10-17 06:32:41 -04:00
Marc Delisle
bb923e6fb4 Fix typo 2013-10-03 11:25:09 -04:00
Madhura Jayaratne
91d91828fe Generate correct TableIndexesSql for Drizzle 2013-10-02 22:28:04 +05:30
Madhura Jayaratne
9129a60210 Drizzle compatibility 2013-09-28 20:11:53 +05:30
Madhura Jayaratne
e848b29a88 selecting tables by comment does not seem to be used anywhere. If you need to get the list of views, use new $tble_type parameter. 2013-09-22 22:09:38 +05:30
Madhura Jayaratne
190725ce27 Clicking on 'Tables' links in navigation tree should show only tables 2013-09-22 21:29:52 +05:30
Madhura Jayaratne
f3edd98a15 Use type hinting 2013-08-27 22:07:43 +05:30