Commit Graph

310 Commits

Author SHA1 Message Date
Michal Čihař
dbdd7bcb9d Adds error if copy database name have the same name
Fixes #13099
Fixes #13104

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-12 09:01:11 +02:00
Michal Čihař
f73a98e421 Fixed database renaming
Fixes #12955

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-06 13:31:39 +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ř
b56f101039 Remove is_ajax_request global
We already have the same information on Response object, so let's use it
from there.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 17:54:34 +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
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ř
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ř
3e2029e750 Move MySQL charsets handling to the Charsets class
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:55:42 +02:00
Michal Čihař
e2deac4b22 Move getting collation to the DBI layer
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 11:42:29 +02:00
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-03 14:32:14 +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
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
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
98372481bb Remove Drizzle from database level functions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:40 +10:00
Hugues Peccatte
04b4f723d8 Move libraries/plugins/auth and export classes into a namespace.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-05 00:09:30 +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
Marc Delisle
bb01f9b2b7 Refactor db_info.inc.php
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-25 11:16:59 -04:00
Jason
1c28e6a8ab Creating StructureController
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-07-31 01:04:30 +08:00
Hugues Peccatte
08919d9252 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-25 09:36:48 +02:00
Deven Bansod
d014dbcc29 Trial Approach to solve Privileges bug for RFE#657
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-07-01 22:23:52 +05:30
Madhura Jayaratne
a3c3c57261 Use type hinting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 14:06:21 +05:30
Deven Bansod
07e32779de Fixed method Names where they are called
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-05-22 16:26:31 +05:30
Deven Bansod
bb6dfb840e Added Documentation for RFE#657
Changed the Label to "Adjust Privileges"

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-05-22 04:45:55 +05:30
Deven Bansod
5b8e97ce80 RFE 657 : Realigning privileges after DB/Tbl/Col/Proc Rename/Copy
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Changed some Variable-names and
Fixed an error with procs_priv insert.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-05-19 13:21:48 +05:30
Rahul Kadyan
4d308ba364 Remove unneeded closing tags
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
2015-03-06 23:37:35 +05:30
Madhura Jayaratne
1206bcedd7 This is no longer required
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 15:43:06 +05:30
Madhura Jayaratne
10f57c9af6 Use $sql_query as $GLOBALS. There is no point passing them back and forth.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 14:04:03 +05:30
Madhura Jayaratne
186ff1ee79 Simplify the condition
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 13:34:06 +05:30
Madhura Jayaratne
5f646285dc This method is redundant
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 13:30:29 +05:30
Madhura Jayaratne
f5c263119d Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 12:44:09 +05:30
Madhura Jayaratne
9a818c289d bug #4607 Syntax error during db_copy operation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-26 12:39:09 +05:30
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 17:40:09 +01:00
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:39 +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
Marc Delisle
66be2f7699 Fix code execution path warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-05 17:31:56 -04:00
Madhura Jayaratne
241aa4767a Define $sql_query in all paths
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-04 18:24:43 +05:30
Madhura Jayaratne
29bf47e49b Define $message in all paths
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-04 18:22: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
6cadd6ef31 Improve messages
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-25 08:07:42 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-11 18:33:59 +05:30
D-storm
0e23ac91ac clarify variable origin (db_operations.php)
Signed-off-by: D-storm <chirayu.chiripal@gmail.com>
2014-07-28 01:21:19 +05:30
Bimal Yashodha
adf0d2e4b7 Remove old relational schema edit/export page and related code
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
2014-07-01 17:51:45 +05:30