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

308 Commits

Author SHA1 Message Date
Michal Čihař
c3401ec878 Merge branch 'QA_4_6-security' into master-security 2016-07-12 12:50:54 +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ř
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +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ř
9869a95641 Simplify Message adding methods 
The methods are now called based on added type:

- addHtml adds HTML code as is
- addText adds text after escaping it
- addMessage adds Message instance

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:23:45 +02:00
Michal Čihař
54a76de3d8 'Replace addString calls with correct method based on content 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:20:30 +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
Michal Čihař
5bb7349e0d Merge branch 'QA_4_6' 2016-05-23 09:21:33 +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ř
f90ca55a57 Add missing error check 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:10:38 +02:00
Michal Čihař
b54e5b0c4b Use File class for file imports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:09:40 +02:00
Deven Bansod
3b227209a1 Make phpcs happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-22 11:50:22 +05:30
Madhura Jayaratne
ccc17ae112 Merge branch 'bookmark' 2016-03-10 00:58:49 +11:00
Madhura Jayaratne
5c4c0c242c Pass bookmark variables as method parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 00:28:00 +11:00
Madhura Jayaratne
b55ddd09b5 Use as non-static methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 00:25:06 +11:00
Madhura Jayaratne
263bd601e6 Remove bookmark library includes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:57:09 +11:00
Madhura Jayaratne
b47256cad2 Check whether valid bookmark was returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:52:09 +11:00
Madhura Jayaratne
43cfba9f24 Refactor bookmarking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:39:29 +11:00
Michal Čihař
28d15ebb8c Add method for checking if encoding conversion is supported 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:26:49 +01: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ř
4de7b648d2 Merge branch 'QA_4_6' 2016-02-17 12:04:03 +01: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ř
7407d4931c Merge branch 'QA_4_6' 2016-02-17 11:39:39 +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ř
f1379e2b26 Merge branch 'QA_4_6' 2016-02-17 11:33:02 +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
Madhura Jayaratne
8331fd7831 Remote TODO that does not make sense 
Defining parameters for all import plugins centrally defeats the purpose of the plugin architecture

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-17 08:43:13 +11: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