gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,855 Commits 12 Branches 481 Tags 2.4 GiB
733a5d5821
Commit Graph

291 Commits

Author SHA1 Message Date
Michal Čihař
283f5d10ce Fix possible DOS on too big skip value 
- loop only as long as long we have data to skip
- convert skip parameter to integer

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 13:44:43 +02:00
Michal Čihař
d621855169 Merge branch 'QA_4_6' into QA_4_6-security 2016-08-01 11:06:57 +02:00
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ř
1e6b740e6f Enable LOAD DATA LOCAL INFILE only when needed 
There is no need to have this feature allowed for normal SQL queries, it
can lead to leaking sensitive files from the web server. It's enough to
enable it only in LDI import plugin, where we control what queries are
executed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-23 09:02:31 +02:00
Michal Čihař
0d57c09bd5 Do not allow symlinks in UploadDir 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 12:50:36 +02:00
Michal Čihař
1cc7466db3 Quote delimiter before using preg_replace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:16:03 +02:00
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ř
c60f97331a Avoiud displaying query without message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 12:03:55 +01:00
Michal Čihař
0a2facdfe9 Properly use plural for message with number of queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:39:16 +01:00
Michal Čihař
8bf212f6c3 Avoid displaying import query twice 
Fixes #11907

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:32:22 +01:00
Michal Čihař
bc2990d5bd Merge branch 'QA_4_5' into QA_4_6 2016-02-12 15:53:59 +01:00
Michal Čihař
3bacb68305 Make sure format is always defined 
Fixes #11955

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:53:50 +01:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +01:00
Michal Čihař
53b1f9adcc Silent errors on checking for files and folders 
Fixes #11951
Fixes #11952

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:45:04 +01:00
Madhura Jayaratne
32775553df Merge branch 'QA_4_5' 2016-01-15 12:43:41 +11:00
Madhura Jayaratne
ff967d99b8 Fix #11814 SQL comment and variable stripped from bookmark on save 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 12:40:30 +11: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
Marc Delisle
fb6e971a3b Merge branch 'QA_4_5' 2015-12-28 08:16:01 -05:00
Marc Delisle
9a40c11797 Fixes #11792 Undefined index: parameters 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-28 08:15:23 -05:00
Michal Čihař
cc07b737dc Remove unused PMA_String class 
The class is no longer used:

- the ctype part is not needed by new SQL parser
- the utf-8 manipulation was replaced by direct usage of mbstring

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 12:09:06 +01:00
Michal Čihař
98d88ef134 Remove unused pmaString variable 
It was used in past when we didn't rely on mbstring.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 11:35:36 +01:00
Marc Delisle
c3a30a0ad4 Merge branch 'QA_4_5' 2015-11-22 17:44:16 -05:00
Marc Delisle
9b34d380b1 Fixes #11685 Warning: Invalid argument supplied for foreach() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-22 17:43:25 -05:00
Marc Delisle
5d7e216eee Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-07 03:59:44 -08: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
Hugues Peccatte
ffc4422db7 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-19 20:33:21 +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
a5d35d41b6 Revert PMA_String rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-14 22:39:03 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
7fadb9e37f Remove Drizzle support from import and export 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:37 +10:00
Hugues Peccatte
178a6edd38 Add namespace on part of plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:33:42 +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
a6fedd3415 Merge branch 'QA_4_4' 2015-08-10 08:42:23 -04:00
Marc Delisle
c0803823f2 Fixes #11380 Incomplete message after import 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 08:41:07 -04:00
Dan Ungureanu
6e1b2aa54b Fix #11340. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-02 00:15:36 +03:00
Marc Delisle
1c416c14d6 Directly use the POST parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 08:38:59 -04:00
Marc Delisle
c30271da7a Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-30 08:33:37 -04:00
Marc Delisle
da4bcee69f Directly use the POST parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 18:43:12 -04:00
Dan Ungureanu
b6fc66649e Added tests for sql.lib.php and parse_analyze.inc.php. 
Removed dead code.
Fixed miscellaneous issues.
Fixed a bug in PMA_isJustBrowsing().
Updated sql-parser library to udan11/sql-parser@e713c9f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Hugues Peccatte
9cbfa30745 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 17:47:53 +02:00
Hugues Peccatte
bf61709259 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 14:38:07 +02:00
Dan Ungureanu
f7689d5c7e Replaced more of the old parser. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:15 +03:00
Madhura Jayaratne
a3c3c57261 Use type hinting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 14:06:21 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-31 12:28:41 +05:30
Madhura Jayaratne
6439a10af2 bug #4872 Drop table doesn't remove the table name from navigation bar 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 19:17:58 +05:30
Madhura Jayaratne
cca0e028b5 Improve parameter applying 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-29 18:33:37 +05:30
Madhura Jayaratne
8cb82815c7 rfe #1380 Support for Paramaters with raw SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-29 15:35:52 +05:30
Marc Delisle
498c14fc62 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-09 11:47:59 -04:00