Commit Graph

332 Commits

Author SHA1 Message Date
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ř
0490d20408 Check for parameter before using it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 10:48:32 +01: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
fe7a2c095b Fixes #11592 Missing headers in zipped export
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-21 10:49:18 -04: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
Marc Delisle
3522eaa76e Directly use a POST parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-11 15:47:51 -05:00
Hugues Peccatte
037a034b43 Minor coding style modifications.
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 14:04:35 +01:00
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
b1a7039ae3 Convert PMA_URL_getCommon calls to new style
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:29 +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
3ea2e7d81f rfe #3120 Events are not exported when using xml
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-07 18:30:10 +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
Marc Delisle
cd2225c997 Merge branch 'QA_4_2' 2014-09-27 09:14:31 -04:00
Marc Delisle
deea8c6946 bug in PDF export: title not present in PDF
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-27 08:39:00 -04: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
ec98368ec7 Avoid warning from PHP Analyzer
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-23 09:13:37 -04:00
Marc Delisle
c41989eca1 Fix code execution path warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-09 08:37:35 -04:00
Marc Delisle
178432bfe3 Fix execution path notices
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-27 12:22:02 -04:00
Chirayu Chiripal
6dc1178eae bug-4479 Missing permission in export dir not detected
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-29 20:22:49 +05:30
Chirayu Chiripal
1dd8d8c28c fix: error in export with option view output as text
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-19 17:30:50 +05:30
Chirayu Chiripal
3ea7d2b52d rfe-755: export with table/column name changes
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-16 22:41:50 +05:30
Chirayu Chiripal
9ca3784568 fix: sql export views as tables getting ignored
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-15 23:39:09 +05:30
Marc Delisle
a83ca5d73b Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-10 12:43:07 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-10 19:00:16 +05:30
Michal Čihař
06abaaa33f Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 08:59:18 +02:00
Isaac Bennetch
307dd3b798 Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2014-06-09 16:37:43 -04:00
Chirayu Chiripal
33dfef377f RFE-759 Use aliases in SQL export for tables and columns
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-09 22:44:07 +05:30
Michal Čihař
cff38db7f2 Share code for rending correct page after export
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 12:02:39 +02:00
Michal Čihař
4dea92dc9d Simplify condition (this is just an else branch)
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 11:59:09 +02:00
Marc Delisle
dbef39fc24 Remove unneeded end of if/start of if
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-29 12:47:11 -04:00
Marc Delisle
05912b5c2c Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-10 06:11:24 -04:00
Smita Kumari
b21c43245d bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-04-09 22:07:38 +05:30