Commit Graph

359 Commits

Author SHA1 Message Date
Isaac Bennetch
583e5e660a Remove dead code and strings relating to xls/xlsx import and export.
This code was removed in 3.4.5.0 but some strings and tests remained.

Fixes #12742

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2017-01-17 22:01:45 -05:00
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ř
045046a1dc Document task to do
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 17:09:21 +02:00
Michal Čihař
45ef3aed75 Remove needless inclusion of export.php from tests
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-16 11:38:58 +02:00
Madhura Jayaratne
c6d2f0012c Merge branch 'QA_4_6' 2016-03-14 22:16:07 +11:00
Madhura Jayaratne
c8e51a1b59 Fix #12092 Rename exported databases/tables doesn't seem to work
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-03-14 22:13:48 +11: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
Michal Čihař
4ed47fc4b4 Move charset conversion to a class
Also removes ancient support for AIX iconv.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-03-08 14:05:59 +01: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ř
c0e370e356 Merge branch 'QA_4_5' 2016-01-22 15:27:34 +01:00
Michal Čihař
da62e19833 Correctly handle what parameter on export
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-22 15:27:15 +01:00
Michal Čihař
0f119bb329 Merge branch 'QA_4_5' 2016-01-19 11:31:41 +01:00
Michal Čihař
0490d20408 Check for parameter before using it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 10:48:32 +01:00
Madhura Jayaratne
c60c33377d Fix TODO: Use finally as it's available in PHP >= 5.5
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-14 12:36:18 +11: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
7da4dd0031 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-08 16:03:04 +01:00
Marc Delisle
c3720ce8bf Merge branch 'QA_4_5' 2015-11-08 05:39:26 -08:00
John Homerstad
711fab59d1 Fixes #11648 Notice in ./export.php#214 Undefined index: quick_or_custom
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-08 05:37:46 -08:00
Marc Delisle
f869dbccc6 Merge branch 'QA_4_5' 2015-10-21 10:49:47 -04:00
Marc Delisle
fe7a2c095b Fixes #11592 Missing headers in zipped export
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-21 10:49:18 -04:00
Hugues Peccatte
e99ac906e1 Move classes in new files.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-26 22:22:06 +02:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Madhura Jayaratne
45c05e3ad6 Fix coding style violations related to function calls
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 21:00:47 +10: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
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
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-20 10:06:38 +05:30
Madhura Jayaratne
f8c00915dd Use proper names as file names. Fix undefined notices
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-31 15:32:51 +05:30
Marc Delisle
0e8c6983b8 Make scrutinizer happy
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-28 20:43:08 -04:00
Hugues Peccatte
bf61709259 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-23 14:38:07 +02:00
Marc Delisle
ea015a5389 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-15 08:06:35 -04:00
Dan Ungureanu
617f807c57 Minor fixes.
Updated sql-parser library to udan11/sql-parser@d8b3a98.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:19 +03:00
Dan Ungureanu
8a5e8a275a Using the new parser when generating a table's definition.
Fixed a small bug regarding an undefined variable.
Updated sql-parser library to udan11/sql-parser@30fdd07.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:19 +03:00
Dan Ungureanu
11f42cd80e Using the new parser for exporting.
Updated sql-parser library to udan11/sql-parser@06c0a64.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:17 +03:00
Dan Ungureanu
5d6e139dc1 Replaced PMA_SQP_getAliasesFromQuery().
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:11 +03:00
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-30 15:16:42 +05:30
Nisarg Jhaveri
9ef59e49e5 rfe#1603 select structure or data for each table when exporting
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-27 17:09:59 +05:30
Deven Bansod
a49e6f533d Provide an option to export tables in a database as separate files
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-21 16:05:43 +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
Madhura Jayaratne
ef981aa335 rfe #1632 Importing and exporting pMA meta-data
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 16:00:57 +05:30
Marc Delisle
4eccae5290 Merge pull request #1547 from znck/master
Remove unneeded closing tags
2015-03-26 07:56:45 -04:00
Hauke Henningsen
477bb0dc0c
Add option for exporting pretty-printed JSON
This adds a single option to the JSON export plugin,
which, if available (PHP >= 5.4.0) corresponds to passing
`JSON_PRETTY_PRINT` to `json_encode`.

Signed-off-by: Hauke Henningsen <sqrt@entless.org>
2015-03-16 03:22:56 +01:00
Madhura Jayaratne
df38a76b9f rfe #1306 Add lock tables, disable keys options
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-11 10:48:59 +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
Marc Delisle
cbbdf9825a Fix code execution path warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-28 10:33:36 -05:00