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

108 Commits

Author SHA1 Message Date
Michal Čihař
970de0ac7a Merge branch 'QA_4_6' into QA_4_6-security 2016-11-10 11:09:21 +01:00
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
Michal Čihař
161e408ab7 Merge branch 'QA_4_6' into QA_4_6-security 2016-09-19 11:37:02 +02:00
Deven Bansod
4e534c977f Fix Export and Copy of Tables with Generated/Virtual columns 
We include only the non-generated columns insert using INSERT INTO .. SELECT .. FROM .. while copying data.

In Export too, we export the data of only the non-generated columns

Fix #12221
Fix #12518

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 14:18:26 +05:30
Michal Čihař
cf83d6afbe Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-18 10:00:06 +02:00
Madhura Jayaratne
e7003792d9 Escape generated query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-18 09:13:02 +10: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
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
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Madhura Jayaratne
dcdd08a043 No need to break line here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:32:50 +11:00
Madhura Jayaratne
fd0f3d4264 Merge branch 'QA_4_5' 2015-12-11 16:29:12 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11: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
8ac9634c7a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 13:30:22 +02:00
Marc Delisle
b88f03c718 Merge branch 'QA_4_5' 2015-10-13 09:25:36 -04:00
Marc Delisle
56ab89da6c Fix parameter order 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 09:25:15 -04:00
Hugues Peccatte
e99ac906e1 Move classes in new files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 22:22:06 +02:00
Hugues Peccatte
21460a01c0 Merge branch 'master' into useNamespaces_master 2015-09-18 23:17:22 +02:00
Marc Delisle
5d008acb33 Fix param doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-18 13:56:25 -04: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
Madhura Jayaratne
154d62d27d Fix #11436 CREATE DATABASE should be enabled by default on server exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 18:52:37 +10:00
Hugues Peccatte
00bd7f02f3 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:36:16 +02:00
Jason
fb2fb18dcd Fixes issue #11399. 
- Also some changes were made to prevent same kind of bug from occuring again

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-21 07:23:27 -04:00
Madhura Jayaratne
906ab32112 Exporting metadata should be done last since it uses a USE statement 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 07:20:12 +05:30
Marc Delisle
c3c196cad8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:49:17 -04:00
Madhura Jayaratne
f8c00915dd Use proper names as file names. Fix undefined notices 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 15:32:51 +05:30
Madhura Jayaratne
3354439a86 Reorganize to improve clarity. Join routines with tables when exporting as separate files. Export metadata and events when exporting as separate files. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:06:39 +05:30
Madhura Jayaratne
91fd305782 Do not export events in case of exporting tables separately 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 13:01:46 +05:30
Madhura Jayaratne
8ebb632bc2 Merge branch 'QA_4_4' 2015-07-31 12:42:54 +05:30
Madhura Jayaratne
eea2bf811a Fix #11336 Exporting a table exports database level events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:36:53 +05:30
Marc Delisle
0e8c6983b8 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-28 20:43:08 -04:00
Marc Delisle
11472afa87 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-28 19:49:40 -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
e29101e06f Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 22:20:28 +02:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Marc Delisle
e40ff1765d Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-20 06:34:01 -04:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Marc Delisle
0d2c8996aa Cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-18 12:49:19 -04:00
Marc Delisle
ea015a5389 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-15 08:06:35 -04:00
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:06:28 +05:30
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:03:57 +05:30
Madhura Jayaratne
7a6e1bf6e4 Match with config names, more instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:23:19 +05:30
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:16:42 +05:30
Nisarg Jhaveri
9ef59e49e5 rfe#1603 select structure or data for each table when exporting 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-27 17:09:59 +05:30
Dan Ungureanu
3b56d90297 Syntax error and refactoring. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-06-24 19:45:49 +03:00
Deven Bansod
a49e6f533d Provide an option to export tables in a database as separate files 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-21 16:05:43 +05:30
Madhura Jayaratne
cf3375ba58 Merge branch 'QA_4_4' 2015-06-04 21:49:32 +05:30