Commit Graph

55 Commits

Author SHA1 Message Date
Michal Čihař
d0b14a526b Merge branch 'QA_4_7' 2017-08-30 12:59:04 +02:00
Michal Čihař
0e8729264c Add missing require
Fixes #13444

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-30 12:58:53 +02:00
Michal Čihař
ca68951b85 Merge branch 'QA_4_7' 2017-08-29 15:34:34 +02:00
Michal Čihař
f2cb155ed1 Use same OS name on client and server
Issue #13444 and #13628

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-29 15:34:21 +02:00
Michal Čihař
7d0f3d926d Merge branch 'QA_4_7' 2017-08-29 14:59:36 +02:00
Michal Čihař
2f04cdaa7a Properly escape javascript variables
In case some variable name contains special chars, we should really
escape it.

Issue #13444

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-29 14:58:40 +02:00
Manish Bisht
c1ef1ca196 made server status page responsive
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
2017-07-10 22:27:20 +05:30
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-08 10:54:21 -03:00
Maurício Meneghini Fauth
8f943ae1c0 Move classes to PhpMyAdmin namespace
- Move Sanitize to PhpMyAdmin namespace
- Move SavedSearches to PhpMyAdmin namespace
- Move Scripts to PhpMyAdmin namespace
- Move ServerStatusData to PhpMyAdmin namespace
- Move Sql to PhpMyAdmin namespace
- Move StorageEngine to PhpMyAdmin namespace
- Move SubPartition to PhpMyAdmin namespace
- Move SysInfoLinux to PhpMyAdmin namespace
- Move SysInfoSunOS to PhpMyAdmin namespace
- Move SysInfoWINNT to PhpMyAdmin namespace
- Move SysInfo to PhpMyAdmin namespace
- Move SystemDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-07 01:46:08 -03:00
Maurício Meneghini Fauth
05e39541c7 Remove inline CSS
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-22 23:21:03 -03:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +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ř
3546bed47e Avoid using mb_strlen for checking whether string is empty
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-16 10:29:21 +02:00
Michal Čihař
c328697e39 Do not use mb_strlen result for string indexes
The string indexes are in bytes, while mb_strlen counts chars.

Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-29 13:54:04 +02: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
Hugues Peccatte
8baf7c4a8a Update PHPDoc.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-12-11 23:21:54 +01:00
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
d2d0fc1263 Remove useless empty lines at beginning of files.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-27 18:56:40 +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
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
8dcb93c631 More server level Drizzle functions removed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:35 +10:00
Madhura Jayaratne
d16bc93ff1 Remove Drizzle support from functionalities in server level
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:33 +10: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
4c968434e5 Use sentence case for these as well
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 21:41:27 +10:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Madhura Jayaratne
3d85296d79 Spaces around assignments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:06:36 +05:30
Hugues Peccatte
a68ea85d4d Remove unused locale variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-10 23:26:57 +01:00
Hugues Peccatte
217644347a Fix merge issue.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-12 19:00:15 +02:00
Hugues Peccatte
70a21ec25c Merge from master.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-08 21:49:37 +02:00
Madhura Jayaratne
9a3ac8db2f Fix function name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-07 14:28:37 +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
Hugues Peccatte
3a69a24531 Fix removed line.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-10 00:45:08 +02:00
Hugues Peccatte
68b98335ff Coding style modifications.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-10 00:27:37 +02:00
Hugues Peccatte
e2bf49c96d Coding style modifications.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-10 00:19:50 +02:00
Marc Delisle
e2b38097ba Merge branch 'QA_4_2' 2014-07-23 08:37:10 -07:00
Marc Delisle
2688b367a8 Remove code for older MySQL version (no longer supported)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-23 08:36:08 -07:00
Chirayu Chiripal
32511719b1 RFE-1490 Dynamic process list
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-24 19:13:21 +05:30
Ann + J.M
486dd3b4e3 Monitor: Check for possibly undefined memory usage values
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 13:32:53 +02:00
Madhura Jayaratne
33343fbdf4 bug #4398 Monitor should fit into screen width
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-18 14:09:51 +05:30
Michal Čihař
b485c6105c Remove blank lines from the end of PHP files (causing extra output)
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-24 10:57:21 +01:00
Hugues Peccatte
9d059ee7a8 Minor PHPCS corrections.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-01 17:30:13 +01:00
Hugues Peccatte
3b6ebb7467 Reduce number of nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 22:14:05 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables.
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-04 20:46:18 +01:00
Madhura Jayaratne
728d3f32a3 Doc comment improvements 2013-11-29 23:23:19 +05:30
Dieter Adriaenssens
377c682304 wrap long lines 2013-09-15 12:35:44 +02:00
Michal Čihař
523086a2f2 Better loading message 2013-08-11 13:16:59 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00