Commit Graph

90 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
b9c0463d96 Use short array syntax instead of long array syntax
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 01:42:21 -03:00
Maurício Meneghini Fauth
d243f7ccd6 Enable strict mode in libraries files
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 03:20:45 -03:00
Maurício Meneghini Fauth
d758e062a9 Refactor PhpMyAdmin\Replication methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-13 18:21:55 -03:00
Maurício Meneghini Fauth
58c755785c Replace static methods with instance methods
Replaces PhpMyAdmin\ReplicationGui static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-27 21:35:30 -03:00
Maurício Meneghini Fauth
dcedb418dc Refactor replication_gui functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-13 16:00:40 -03:00
Maurício Meneghini Fauth
96223ca40b Refactor replication functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-13 13:12:25 -03:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-28 21:17:18 -03:00
Maurício Meneghini Fauth
e330402b5b Refactor the core functions into static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-03 00:52:22 -03:00
Michal Čihař
a1a306c7ce Add missing use call
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-08 11:09:18 +01: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
Deven Bansod
2fdb15c36e Replace call to an old and unavailable function
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-10-11 11:44:26 +05:30
Michal Čihař
1f595e37e0 Move hostname sanitization to correct place
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-29 14:09:37 +02:00
Michal Čihař
aebbb31aad Merge branch 'master' into master-security 2016-07-29 14:08:23 +02:00
Michal Čihař
25a38b2067 Determine correct user/password for connect in DatabaseInterface
The API only specifies what kind of link we want and we will get it.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-29 11:51:09 +02:00
Michal Čihař
f30f65c67a Indentify connection type by one flag
Use integer values rather than set of boolean flags. This makes it
easier to make decision and makes the code more readable. Also removes
confusion what should happen in case both boolean flags are set.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-29 11:36:07 +02:00
Michal Čihař
767195e197 Sanitize MySQL host name before connecting
It can contain p: prefix which we don't want to honor.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 15:14:57 +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
f9d582bd09 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-08 15:58:48 +01: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
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
b4007f12da Revert 86c740bc57. This is being referred
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-13 08:23:07 +05:30
Madhura Jayaratne
b9ab876cdc Avoid fetching these data on file inclusion, rather fetch them when required
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-13 08:19:24 +05:30
Madhura Jayaratne
86c740bc57 Fetch this only when it is required
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-13 08:14:15 +05:30
Madhura Jayaratne
c7a563893b These two should be $server_slave_replication
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 17:02:35 +05:30
Hugues Peccatte
829a84b46e Refactor replication_info filling.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 16:24:45 +01:00
Hugues Peccatte
8280bb0f9e Manage empty values of slave replication.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 16:12:26 +01:00
Hugues Peccatte
01c514e060 Manage empty values of slave replication.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 16:08:40 +01:00
Hugues Peccatte
7a60853443 Replace $replication_info by a global variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 19:14:26 +01:00
Hugues Peccatte
49836e6e6f Use $replication_info everywhere, instead of $server_* variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 16:30:07 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues.
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-01 22:07:18 +01:00
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
ff0011ac3f Merge pull request #1353 from Tithugues/securityStringSquash
Mass modifications to use PMA_String.
2014-09-06 19:15:06 +02:00
Hugues Peccatte
767b45380c Merge branch 'master' into securityStringSquash 2014-09-06 11:48:24 +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
Igor Prokopenkov
adb0ad4fb8 https://github.com/phpmyadmin/phpmyadmin/pull/1351/files#r16997280
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-03 12:50:12 +03:00
Igor Prokopenkov
5a5bd3e535 Fixed undefined index notices
Fixed misspelling in the comment

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-02 15:06:54 +03:00
cmyker
06e8b65738 Support of MariaDB 10+ multi-master replication functionality See https://mariadb.com/kb/en/mariadb/documentation/replication-cluster-multi-master/replication/multi-source-replication/
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
2014-09-02 13:52:09 +03:00
Michal Čihař
4fe6bf0737 Fix return value types
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 10:43:34 +02:00
Marc Delisle
806687331a Fix undefined variable notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-25 10:31:59 -05:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Marc Delisle
efb60dbe7f Remove dead code 2013-11-07 08:08:21 -05:00
xmujay
252a392592 1. change the function name
2. fix Div function
3. using $_REQUEST when the variable is in the request list
2013-06-22 01:32:17 +08:00
xmujay
1044df611a refactor server_replication.php
1. render HTML at once
2. split long functions
2013-06-20 01:10:24 +08:00
Madhura Jayaratne
01cdc5cbf7 Few renamings that got missed 2013-05-24 19:53:52 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Madhura Jayaratne
af177aca2b Wrap more long lines 2013-05-23 23:34:15 +05:30
Madhura Jayaratne
d5c4c6c76e Wrap some long lines 2013-05-23 23:31:59 +05:30
Madhura Jayaratne
44a528671c Rename PMA_replication_master_replicated_dbs -> PMA_Replication_Master_getReplicatedDbs 2013-05-23 23:30:38 +05:30