Commit Graph

309 Commits

Author SHA1 Message Date
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
Aditya Sastry
fa88c27ad6 Adds the maximum table size to export option (Feature request 1515)
Added a textbox to the custom export options, in the loop where the
Exporting is done, I added a query which checks the current table's size.
If this size is greater than the limit specified we don't export the current
table.

Signed-off-by: Aditya Sastry <ganeshaditya1@gmail.com>
2014-03-22 20:21:19 +05:30
Hugues Peccatte
1b13ecac80 Fix use of a missing variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-28 22:07:52 +01:00
Madhura Jayaratne
0aae267d06 Merge branch 'QA_4_1' 2014-02-26 07:26:31 +05:30
Madhura Jayaratne
ff064833ec bug #4291 Unable to export comments in OpenDocument text format
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-26 07:22:04 +05:30
Madhura Jayaratne
b0cd856632 bug #4297 DROP DATABASE tick box in export no longer works
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-26 06:47:41 +05:30
Marc Delisle
cd998a4c62 Merge pull request #892 from Chanaka/rfe-1403
rfe-1403 : Support for export only triggers/stored procedures
2014-02-07 07:57:48 -05:00
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-06 23:03:04 +05:30
Marc Delisle
003ede0c61 Avoid undefined variable notices
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-05 10:20:40 -05:00
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-04 22:47:00 +05:30
Madhura Jayaratne
94c3be7f39 Merge branch 'QA_4_1'
Conflicts:
	export.php
2014-02-03 06:11:14 +05:30
Madhura Jayaratne
ceecaa41c1 bug #4263 Japanese character encoding not working properly when exporting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-03 06:06:19 +05:30
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Marc Delisle
379f8b6704 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:39:42 -05:00
Marc Delisle
69c24b78bb ChangeLog entry and fix explanation for bug #4209
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-01 06:19:39 -05:00
Jørgen Thomsen
685c1d3495 bug #4209 Missing compression in one case
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-01 06:18:19 -05:00
Marc Delisle
0e71a3b02c Remove misleading comment
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-31 08:36:19 -05:00
Marc Delisle
deb2be02d1 Refactor: new PMA_exportTable()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-31 08:33:38 -05:00
Marc Delisle
b84198ae6d Refactor: new PMA_exportDatabase()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-30 08:49:26 -05:00
Marc Delisle
7e7fe6dabb Unused variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-30 08:14:57 -05:00
Marc Delisle
15e22751fb Clarify function name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-29 08:05:17 -05:00
Marc Delisle
5031e4cad8 Refactor: new PMA_exportServer()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-29 06:31:44 -05:00
Marc Delisle
706e69e353 Refactor: new PMA_getHtmlForDisplayedExportHeader()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-28 07:59:35 -05:00