Commit Graph

292 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-22 20:51:27 -03:00
Maurício Meneghini Fauth
2631bcedba Move plugins classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-20 11:50:12 -03:00
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
119563b7ea Move classes to PhpMyAdmin namespace
- Move OpenDocument to PhpMyAdmin namespace
- Move OutputBuffering to PhpMyAdmin namespace
- Move Partition to PhpMyAdmin namespace
- Move Pdf class to PhpMyAdmin namespace
- Move RecentFavoriteTable to PhpMyAdmin namespace
- Move Response to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 23:44:10 -03:00
Maurício Meneghini Fauth
54a15dbd9c Move classes to PhpMyAdmin namespace
- Move Logging to PhpMyAdmin namespace
- Move Menu to PhpMyAdmin namespace
- Move Message to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 13:30:04 -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
Michal Čihař
a22b48351e Merge branch 'QA_4_7' 2017-06-15 16:27:55 +02:00
Michal Čihař
14f738c262 Show only supported charsets for conversion
Fixes #13388

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-06-15 16:26:54 +02:00
Michal Čihař
c065224d1c Merge branch 'QA_4_7' 2017-06-13 17:03:42 +02:00
Michal Čihař
358d2fd1f1 Rewrite export alias defining
The old code did load all colums for all tables in all databases in
export. This can easily explode for server wide exports or exports on
database with lot of tables.

It has been rewritten in a way to load required data on demand from
server. This will make aliases defining slightly slower, but I think
it's acceptable price for making the export work on larger databases.

Fixes #13008

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-06-13 17:02:45 +02: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ř
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ř
f36f61314f Remove odd/even markup
Issue #12070

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 10:17:15 +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ř
6b9197d7df Merge branch 'QA_4_6-security' into master-security 2016-07-13 09:49:06 +02:00
Michal Čihař
ceeef53748 Add missing escaping to the export type
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 09:43:07 +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ř
19f76066f2 Separate adding string and Message objects to Message
This way we can rely on type checking and avoid potential problems with
escaping.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-16 15:16:29 +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ř
3bda9a03b9 Move Kanji encoding handling to Encoding class
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-03-08 14:55:41 +01: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ř
f4eb1a9b4f There is no need to reset() before foreach()
The code is there since past when PHP 4 was still supported reset was
necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-05 11:26:34 +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
Marc Delisle
911f8274c7 Clarify class and variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-31 08:09:47 -05:00
Marc Delisle
ab7942be89 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-29 07:29:32 -05:00
Marc Delisle
a8c6cdc006 Fix warnings; remove unneeded variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-21 07:40:27 -05:00
Marc Delisle
e02542d0ba Refactor handling of export template actions
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-21 06:50:41 -05: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
8ac9634c7a Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-24 13:30:22 +02:00
Hugues Peccatte
7a2890bcf2 Update after merge.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 00:54:08 +02:00
Hugues Peccatte
b92491d799 Merge branch 'master' into useNamespaces_master 2015-09-12 00:53:39 +02:00
Marc Delisle
77c0d66a1b Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-11 13:37:54 -04:00
Marc Delisle
27e54fb194 Refactor to remove display_export.inc.php
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-09-11 11:44:26 -04: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
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
2c4ef3888d Fix bug - Do not export sys database when exporting server
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-28 19:44:33 +10:00
Madhura Jayaratne
6eb6786506 Standardize to sentence case
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-26 16:57:42 +10:00
Madhura Jayaratne
b40312deea Simplify be using the plural form as its the general case
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-26 16:43:36 +10:00
Jason
6636153071 Resolve conflicts from upstream
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-07-23 11:29:53 +08:00
Madhura Jayaratne
6e788d45cc Remove redundant style causing trouble in rtl
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-21 10:34:32 +05:30
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
8c19eedca1 Use correct name format
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-17 14:11:19 +05:30
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:06:28 +05:30
Madhura Jayaratne
cf7484d573 Fix case
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-08 18:16:03 +05:30
Marc Delisle
b0994d0507 Merge pull request #1771 from madhuracj/rfe812
#812 store export definitions for reuse
2015-07-07 06:57:14 -04:00
Madhura Jayaratne
71d6a654e2 Bug - correctly set lock_table directive when repopulating on back button click
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-06 13:16:11 +05:30