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

389 Commits

Author SHA1 Message Date
Michal Čihař
7e82c9c40c Remove debugging code 
Fixes #13059

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 17:09:48 +01:00
Michal Čihař
585967b7e4 Fix columns selection in case of query fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:09 +01:00
Michal Čihař
9d13e3d143 Display first char field for foreign key if nothing is configured 
In most cases this is what users want to see and anyway it is way better
than showing nothing.

Issue #12835

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:52:05 +01:00
Michal Čihař
27fb0b58af Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1 
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 13:56:35 +01:00
Deven Bansod
84c977b2a4 Merge branch 'QA_4_6' 
Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.php
	po/cs.po
	po/fr.po
 2016-11-25 18:09:26 +05:30
Deven Bansod
a600ff34ff Fix some more instances of wrong arguments 
Issue #12735

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 18:03:30 +05:30
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
c9348b682e Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 2016-11-10 10:59:33 +01:00
Deven Bansod
0bdb13e960 Merge branch 'QA_4_6' 2016-11-10 11:47:25 +05:30
Deven Bansod
ec08844246 Use a forcing parameter to get $the_total records for a foreign key column 
Required at some specific places for ex. browse_foreigners.php (reqd for pagination)
This is in continuation of original fix for #12257 (in #12685)

Also fixed an error in an old commit 9880f57344
related to LIMIT clause generation

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-10 11:43:19 +05:30
Michal Čihař
5dc004dfe0 Merge branch 'QA_4_6' 2016-11-09 18:15:29 +01:00
Deven Bansod
1f439a4dcc Use a work around for testing if numRecords at least N 
Fix #12257

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-07 22:56:19 +05:30
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Deven Bansod
1d70d34a46 Merge branch 'QA_4_6' 2016-10-18 11:24:22 +05:30
Deven Bansod
9880f57344 Fix incorrect clause generation in getting ForeignData if LIMIT provided 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-18 11:10:47 +05:30
Michal Čihař
fc0e6cc095 Remove extra whitespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-10 21:32:50 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Michal Čihař
c2ca1c8c22 Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:58:46 +02:00
Michal Čihař
80b03a4f16 Ensure page number is integer 
Even if somebody decides to change configuration storage structure.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:57:35 +02:00
Michal Čihař
1277bc4666 Remove unused parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:06:18 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others 
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:41:35 +02:00
Madhura Jayaratne
46dee5d1eb Merge branch 'QA_4_6' 2016-03-16 20:50:16 +11:00
Madhura Jayaratne
2f1c996409 Fix #12099 Undefined index: controllink 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-16 20:44:32 +11:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects 
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
9586b8c142 Add missing space to separate two strings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:38:54 +01:00
Michal Čihař
125ad7c7c5 Remove trailing space from a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:20:44 +01:00
Marc Delisle
6fd7fc443d Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-09 07:50:24 -05:00
Marc Delisle
8ef3213f09 Merge branch 'QA_4_5' 2016-01-08 10:13:26 -05:00
Marc Delisle
b8b58486cc Fixes #11804 Misleading message for configuration storage 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-08 10:13:01 -05:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Hugues Peccatte
eda2816c70 Replace font tags by span. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:04:12 +01:00
Hugues Peccatte
22d93ba92f Merge remote-tracking branch 'origin/master' into psr1_master 2015-11-15 17:08:12 +01:00
Madhura Jayaratne
870c2c448b Fix notices about undefined indexes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 22:17:10 +11:00
Madhura Jayaratne
407b68441d Fix #11641 Ability to disable the navigationhiding Feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-12 17:41:11 +11:00
Hugues Peccatte
08cdf6f2fd Merge branch 'master' into psr1_master 2015-11-08 16:16:05 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files. 
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:39 +01:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
e4fcf439f9 Remove references to data_dictionary 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:54 +10:00
Madhura Jayaratne
c196b189af Remove Drizzle support from table related functionalities 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:44 +10:00
Hugues Peccatte
7f8f34e89d Remove classes require_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:21 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Marc Delisle
93d0534439 Fix return type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-23 09:55:19 -04:00
Hugues Peccatte
6a93a350cc Templating ul tag. 
Templating li tag.
Use li template in getHtmlTab.
Use ul/li templates in libraries/user_preferences.inc.php.
Add/update PHPDoc of templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 14:24:44 +02:00
Hugues Peccatte
56c07e6f35 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-25 22:51:02 +02:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00