gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,114 Commits 12 Branches 481 Tags 2.4 GiB
8b6e102cf7
Commit Graph

342 Commits

Author SHA1 Message Date
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
1824f33650 Use justBrowsing only if outputting the results from a single table 
The issue #12533 happens because we use countRecords on the parent table since it is incorrectly set,
while actually we should be looking at SQL_CALC_FOUND_ROWS instead.

Fix #12533

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 13:32:52 +05:30
Deven Bansod
1aaedb32ca Don't output edit/delete row links when table is not set 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 13:08:58 +05:30
Deven Bansod
8c357fab12 Also unset just_one_table while having subquery or having more than or less than 1 tables selected 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:58:05 +05:30
Deven Bansod
6b256e89dd Don't set just_one_table to true when JOIN is present in query 
Fix #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:17:11 +05:30
Michal Čihař
0292b89c4a Merge remote-tracking branch 'origin/pull/12596' into QA_4_6 2016-10-03 19:35:07 +02:00
Deven Bansod
4fb7d73401 Don't assume justBrowsing if there is a Join in the query 
Fix #12189

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 10:50:32 +05:30
Deven Bansod
96eba72fa6 Fix #12327: Show as PHP No longer works 
Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-27 13:47:31 +05:30
Deven Bansod
2f0ec14993 Refactor check function instead of separate function 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-23 11:12:06 +05:30
Deven Bansod
f4877a7826 Assign LIMIT clause only to syntactically correct queries 
Assigning LIMIT clause to an syntactically-wrong query is not needed.
Also we would want to show the true query and the true error message to the query executor

Fix #12321

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:26:02 +05:30
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Deven Bansod
2c5541a94b Fix #12399: Adding index to table shows wrong top navigation 
If the SQL query analyzing sets the $table value to '',
don't update the original value

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 11:41:44 +05:30
Michal Čihař
6d4bd77745 Avoid not needed urlencode/urldecode for bookmarked SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 09:12:52 +02:00
Michal Čihař
6895a1fc6e Revert "fix_11907" 
This reverts commit bfe30d1261.

It removes the message in many cases where it should be shown.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:49:01 +01:00
Piyush
bfe30d1261 fix_11907 
Signed-off-by: Piyush <poush12@gmail.com>
 2016-02-12 22:01:08 +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ř
c036b92b8b Merge branch 'QA_4_5' 2016-01-19 11:59:52 +01:00
Michal Čihař
1431625d68 Fixes possible error when query is empty/not analyzed 
Fixes #11873

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:45:52 +01:00
Michal Čihař
0f119bb329 Merge branch 'QA_4_5' 2016-01-19 11:31:41 +01:00
Michal Čihař
1523c4b364 Gracefully handle calling sql.php without SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Madhura Jayaratne
56f684e466 Move common code inside the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 13:09:55 +11:00
Michal Čihař
7444c5340e Add missing docstring 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:37:26 +01: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
Michal Čihař
5abdf6886b Merge remote-tracking branch 'origin/QA_4_5' 2015-12-21 11:16:39 +01:00
Deven Bansod
0b64ff7f72 Fix #11724 : live data edit of big sets is not working 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-21 13:53:03 +05:30
Michal Čihař
9c289d9794 Do not display results operation for errored query 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:23:06 +01:00
Michal Čihař
8192679052 Properly handle IgnoreMultiSubmitErrors in sql.lib.php 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:17:13 +01:00
Hugues Peccatte
f04a678bad Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:16:13 +01:00
Nisarg Jhaveri
b463cfc0ff Show table header and create bookmark on empty results 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-30 04:28:50 +05:30
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
0a947dd9b9 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 12:50:30 +02:00
Marc Delisle
faaec8e9f4 Refactor high-level parser calling into a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-22 12:07:45 -04:00
Marc Delisle
7311d59fa9 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 15:12:45 -04:00
Marc Delisle
b5d6170b22 Clarify function name 
Remove function's side effect on globals

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-08 11:03:22 -04:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
536d10eb1f Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-19 19:19:23 +02:00
Marc Delisle
ced0d39979 Use function parameter instead of global 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-18 18:05:59 -04:00
Hugues Peccatte
21460a01c0 Merge branch 'master' into useNamespaces_master 2015-09-18 23:17:22 +02:00
Joshua Atkins
0aa5c847dd Browse table bookmark form: Clickable labels 
Make text field and check box labels clickable in the Browse table page,
create SQL bookmark form.

Signed-off-by: Joshua Atkins <support@jublo.net>
 2015-09-17 11:05:40 +02:00
Hugues Peccatte
74ef226857 Merge branch 'master' into useNamespaces_master 2015-09-14 22:10:51 +02:00
Marc Delisle
e6c7f66b0e Fixes #11480 Notice Undefined index: drop_database 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-14 08:16:38 -04:00
Hugues Peccatte
e57640fa50 Remove last '.class' in code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:39:41 +02: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
Madhura Jayaratne
e6756427e4 Add partition maintenance actions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-14 01:14:58 +05:30