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

97 Commits

Author SHA1 Message Date
Michal Čihař
bd2a0ec307 Wrap file_exists calls with @ 
It can produce warnings in case open_basedir is enabled.

Fixes #13467

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:59:43 +02:00
Michal Čihař
8f640b9030 Do not point users to setup when it is disabled 
Fixes #13084

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-15 16:18:05 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling 
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:17:59 +01:00
Michal Čihař
df66e4fa08 Share code for handling uploaded file 
There is no need to duplicate the incomplete logic in several places.

Issue #12514, #12690

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 12:05:59 +01:00
Michal Čihař
2ed64c3c6a Merge branch 'master' into master-security 2016-10-24 13:55:39 +02:00
Deven Bansod
f6d2804aba Merge branch 'QA_4_6' 2016-10-05 11:36:04 +05:30
Deven Bansod
889cd31618 Prevent leaving an orphaned file while importing preferences 
Fix #12362

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 11:33:44 +05:30
Michal Čihař
01f7b3c134 Merge branch 'QA_4_6-security' into master-security 2016-10-04 17:25:05 +02:00
Deven Bansod
f87358dff7 Don't assume the default arg_separator in URL 
Respect the value for arg_separator.input too.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-02 10:42:55 +05:30
Michal Čihař
a15a847ade Add support for export user settings as config.inc.php snippet 
Fixes #6274

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 16:35:03 +02:00
Michal Čihař
ca5eb903b0 Make ThemeManager a singleton instead of storing it in the session 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:34:25 +02:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +05:30
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ř
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
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
06d22e636e Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:41:46 -05:00
Marc Delisle
e16bc39f85 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-05 07:27:29 -05:00
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-04 09:05:42 -05:00
Marc Delisle
2607023281 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-03 11:00:01 -05: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
e5e447e937 Set namespace on config classes. 
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:23 +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
Nisarg Jhaveri
9dfd32317d Fix coding style in page settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 20:20:27 +05:30
Nisarg Jhaveri
9c77ec694e Navigation panel settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 17:15:03 +05:30
Madhura Jayaratne
0f76d59e1e Quit using filter_input since they bypass token check 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:45:09 +05:30
Nisarg Jhaveri
431847b39e Return HTML instead of echo-ing directly in FormDisplay 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 00:56:26 +05:30
Madhura Jayaratne
598435fdda Spaces around - operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:13:23 +05:30
Hugues Peccatte
66c3491041 Minor HTML/PHP rewrite. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 16:35:16 +01:00
Madhura Jayaratne
cd249f1cbe rfe #1572 User prefs: Diff-friendly JSON for config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-30 18:36:51 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
fae654179e Merge pull request #1125 from ashutoshdhundhara/bug_exportSettings_msgs 
Bug fix: Incorrect messages displayed in "Export settings" section.
 2014-04-04 13:00:11 -04:00
Ashutosh Dhundhara
bb3e673b16 Bug fix: Incorrect messages displayed in "Export settings" section. 
Bug fix: Incorrect messages displayed in "Export settings" section.

Signed-Off-By: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-04 18:24:53 +05:30
Michal Čihař
af3bfe6cfb Consistently use comma at the end of notification messages 
These are sentences and should be ended as such.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-28 09:58:17 +01:00
Marc Delisle
d555558709 Merge commit 'cc7f1bf' 2014-03-03 08:22:01 -05:00
Smita Kumari
cc7f1bf1f9 bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-03 18:38:36 +05:30
Hugues Peccatte
f7f5b48e40 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:51 +01:00
Marc Delisle
8381c6e0e8 Do not mix a call to the display method with an echo statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-18 12:54:26 -05:00
Marc Delisle
204e138770 - Fix typo 
- Fix coding style
 2013-11-30 07:44:15 -05:00
Marc Delisle
b7015b68f4 Fix coding style 2013-11-29 05:34:32 -05:00
Marc Delisle
fd1563d10b Fix coding style 2013-11-28 08:08:31 -05:00
Marc Delisle
c170732c30 Fix coding style 2013-11-27 07:30:17 -05:00
Marc Delisle
d2739de4ce Fix coding style 2013-11-25 07:33:06 -05:00
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton 
Fixes bug #4123 Double config including
 2013-11-03 12:54:20 +01:00
Marc Delisle
815581f35e Fix codestyle 2013-09-27 06:35:07 -04:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00