gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

315 Commits

Author SHA1 Message Date
Marc Delisle
47652894f7 Merge branch 'QA_4_0' 2013-06-10 13:01:22 -04:00
Kari Söderholm
0a13fa1938 Fix missing post params in export.php for removeCRLF option in ExportCsv 
and ExportExcel plugins.

This is needed after commit a564d981e9
 2013-06-10 12:58:39 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Madhura Jayaratne
aa8b424626 Merge branch 'QA_4_0' 2013-05-21 16:46:51 +05:30
Madhura Jayaratne
ef4d9361d1 bug #3948 Server export problems 2013-05-21 16:44:41 +05:30
Marc Delisle
a51604e226 Merge branch 'QA_4_0' 2013-05-20 08:11:28 -04:00
ayusun
d8b9a0b28c creating database while exporting at database level 2013-05-16 20:52:50 +05:30
Marc Delisle
13c6e82551 Fix merge conflicts 2013-05-12 08:18:08 -04:00
Marc Delisle
4113d9e98b bug #3915 Import of CSV file (Replace table data with file) with duplicate values 2013-05-12 08:09:02 -04:00
Michal Čihař
0c2832ca04 Consistent function naming in Kanji support module 2013-05-10 09:53:41 +02:00
Madhura Jayaratne
ce94d11699 Merge branch 'QA_4_0' 
Conflicts:
	po/da.po
	po/el.po
	po/es.po
	po/ko.po
	po/pt.po
	po/pt_BR.po
	po/sl.po
	po/sq.po
	po/sv.po
 2013-05-07 00:14:18 +05:30
J.M
2af515a9b8 Fix bug #3905 [export] Custom Exporting exports all databases 2013-05-05 13:07:51 +02:00
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +05:30
Michal Čihař
5a46990271 Fix indentation and comment placement 2013-05-02 15:36:46 +02:00
Michal Čihař
1d5539d3aa Better function names 
Follow PEAR coding standard for function names.
 2013-05-02 15:01:11 +02:00
Kasun Chathuranga
a85d9eaa2c PMA_DBI_get_tables --> PMA_DBI_getTables 2013-04-30 23:29:55 +05:30
J.M
ff2d22f639 Fix bug #3892 SQL Export files are empty 2013-04-27 22:10:50 +02:00
Marc Delisle
28f74e7c29 Security: block another case of remote execution vulnerability 2013-04-23 16:16:13 -04:00
Marc Delisle
ae67d35cdc Security: sanitize parameter to fix a local file inclusion vulnerability 2013-04-18 13:26:23 -04:00
Marc Delisle
a564d981e9 Security: avoid $GLOBALS overwrite 2013-04-18 13:23:26 -04:00
Marc Delisle
bf9266ef37 Better function name 2013-03-19 07:59:24 -04:00
Gemorroj
d8e5087f5d correct previous commit (bug 3840) 2013-03-18 13:49:16 +03:00
Gemorroj
30b4fda252 bug #3840 When exporting to gzip format, the data is compressed 2 times 2013-03-18 13:15:44 +03:00
Marc Delisle
c46187df98 Missing detection of mod_deflate Apache module in one code path 2013-03-04 12:54:31 -05:00
Michal Čihař
81bdcec2ac This variable might be unset 2013-02-07 12:11:07 +01:00
Marc Delisle
98d290f6e5 Fix merge conflicts 2012-11-10 06:27:26 -05:00
Marc Delisle
dc969a9ae5 bug #3563824 [export] Support Apache mod_deflate 2012-11-10 06:25:10 -05:00
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Madhura Jayaratne
ba16e22315 Coding style improvements 2012-08-31 00:46:35 +05:30
Alex Marin
9458f9d062 oop: integrate the properties system for ExportXml 2012-07-17 13:32:13 +03:00
J.M
b55019e00c Fix function call not camelCased yet 2012-07-02 23:05:23 +02:00
J.M
3449d9f01f Fix html entities for astext export backlink, use jQuery for textSQLDUMP box 2012-07-02 20:51:32 +02:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Alex Marin
3fa180b228 oop: merge master, fix commits 2012-06-27 19:52:37 +03:00
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Madhura Jayaratne
f5ed603c36 Use camel case for function names - another instance 2012-06-23 22:59:08 +05:30
Madhura Jayaratne
6fdf3a9243 Class names should start with capital letters 2012-06-23 22:12:51 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Alex Marin
5623356e7a oop: fix bugs and phpcs errors for all export plugins 2012-06-18 14:22:12 +03:00
Alex Marin
2c9fba0560 Merge branch 'work_week3' into plugins-and-OOP 2012-06-17 11:43:45 +03:00
Alex Marin
0899d6722e oop: merge master 2012-06-17 11:40:11 +03:00
Alex Marin
88a958828b oop: remove debugging echo from export.php 2012-06-16 17:14:55 +03:00
Alex Marin
06d6645eb3 oop: ExportPhparray 2012-06-16 16:55:22 +03:00
Alex Marin
4b0dbf6a42 oop: ExportLatex 2012-06-15 19:22:07 +03:00
Rouslan Placella
ae6e50a8a8 Drop display() from Header and Footer classes. The Response class will do all the rendering. 2012-06-11 14:06:04 +01:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Alex Marin
683d7677b9 oop: export codegen; camel caps export naming convention 2012-06-08 11:47:36 +03:00
Alex Marin
04f82137cb oop: export properties bug 2012-06-07 19:47:02 +03:00
Alex Marin
0ff6393062 plugins and OOP: merge master, fix conflicts 2012-06-04 12:14:32 +03:00
Madhura Jayaratne
73d69309c7 Fix warning "There must be exactly one blank line before the tags in file comment" 2012-06-03 20:09:25 +05:30
Madhura Jayaratne
5d71c1c3d7 Add spaces after exclamation marks to improve readability 2012-06-03 20:08:02 +05:30
Madhura Jayaratne
ab646aa440 Wrap some more long lines 2012-06-03 20:04:23 +05:30
Madhura Jayaratne
dae2a92ffd Wrap some long lines 2012-06-03 20:00:33 +05:30
Madhura Jayaratne
10510e16b4 Fix function name: PMA_download_header -> PMA_downloadHeader 2012-06-01 21:52:30 +05:30
Alex Marin
a87f283a23 plugins and OOP: create general class structure and ExportXML 2012-05-28 00:21:14 +03:00
Michal Čihař
54dc10a012 Use PMA_fatalError instead of die 2012-05-09 11:58:10 +02:00
Alex Marin
4806c07aa0 Export plugins coding style: move arguments with default values at the end 2012-05-01 23:49:11 +03:00
Madhura Jayaratne
50e6f3b387 Coding style improvements (ControlSignature) 2012-04-25 23:02:37 +05:30
Madhura Jayaratne
ef68eaa254 Fix Checkstyle Warnings - Type: CloseBracketLine 2012-04-14 10:40:39 +05:30
Jo Michael
b9c474c21c Replaced *[align] with *[class] for HTML5 validity 2012-03-27 14:09:12 +02:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Jo Michael
5904800e03 Don't rely on grab_globals for export.php 2012-03-16 19:46:02 +01:00
Madhura Jayaratne
2b6f9bff62 Coding style improvements 2012-03-15 00:08:06 +05:30
Dieter Adriaenssens
8078441519 typo 2011-12-30 19:53:11 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Marc Delisle
9db5e4447c Fix merge conflicts 2011-10-19 13:21:42 -04:00
Marc Delisle
c76d9fea3a Merge branch 'QA_3_4' 2011-10-19 13:15:05 -04:00
Marc Delisle
ec99ab3e00 bug #3426031 [export] Export to bzip2 is not working 2011-10-19 13:11:22 -04:00
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Madhura Jayaratne
14c332461c Merge branch 'QA_3_4' 
Conflicts:
	export.php
 2011-08-24 22:50:37 +05:30
Madhura Jayaratne
786328c50b Sanitize filenames (in a unified manner) before using in Content-Disposition header 2011-08-24 22:44:38 +05:30
Marc Delisle
4d2521ac91 Merge branch 'QA_3_4' 2011-08-24 12:30:15 -04:00
Herman van Rink
c547703b10 Sanitize filenames before using in Content-Disposition header 2011-08-08 20:07:09 +02:00
Michal Čihař
5d05da19f2 Use new function for download headers 2011-08-04 14:19:07 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
84c6bd7284 Fix indentation 2011-07-22 09:06:37 +02:00
Michal Čihař
12a31298bd Spacing around if 2011-07-22 09:05:25 +02:00
Michal Čihař
297bd675cc Wrap long line 2011-07-22 09:02:04 +02:00
Michal Čihař
7b17fca511 Add die() calls are on places which should not happen 2011-07-22 09:01:40 +02:00
Michal Čihař
ea918f98ff Add file comment 2011-07-22 08:59:07 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
f14a4e567f Unify comments for export plugins 2011-07-12 17:50:46 +02:00
Michal Čihař
8f54092c2d Remove forgotten references to $charset 2011-06-03 15:41:59 +02:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset']. 
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
 2011-06-03 14:04:29 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
1484ca6c00 Procedures and functions should be exported also when entering Export on a single db 2011-02-13 14:00:14 -05:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-08-19 14:45:18 +02:00
lorilee
948abf11d4 Added back button on the top of the page as well 2010-08-14 14:09:09 -07:00
lorilee
4b4374d8b3 Check if variable exists before calling 2010-08-11 13:27:08 -07:00
lorilee
030cad2cb6 Removed unneeded commented out code 2010-08-10 22:22:09 -07:00
lorilee
4482228f66 Back button on export.php page 2010-08-10 22:11:57 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
d291827444 No need to require_once footer 
It is the last thing executed anyway (ends with exit).
 2010-07-26 16:20:24 +02:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
b24a566eba Export uses same expanding as title. 2010-07-21 09:36:28 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +02:00
Crack
52550eff13 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Resolved conflicts:
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
 2010-07-20 12:19:21 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
Michal Čihař
765e9021e4 No need to handle convcharset here. 2010-07-20 11:41:21 +02:00
lorilee
5b8c603124 If the user already appended the file extension, don't add it again 2010-07-12 19:10:11 -07:00
Crack
68d9c40113 moved Import by LOAD DATA settings to CSV category 
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
 2010-07-04 21:56:46 +02:00
lorilee
e3f4e4a776 Quick export 
Fixes table export
 2010-06-15 16:19:27 -04:00
lorilee
b1c812422d Updated variable checks for structure and data to reflect new form field names 2010-06-08 22:40:02 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Marc Delisle
7925c03896 gettext conversion 2010-05-11 13:05:43 -04:00
Marc Delisle
87dd6b3cee Merge branch 'QA_3_3' 2010-03-12 17:16:58 -05:00
Dieter Adriaenssens
7c818d046a patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
7efb784901 patch #2961540 Do not export data of MERGE table 2010-03-05 12:44:34 +00:00
Marc Delisle
d47fce3ee3 patch #2961540 Do not export data of MERGE table 2010-03-05 12:44:34 +00:00
Michal Čihař
94c2f864ae [core] Remove config data from session as it brings chicken-egg problem. 
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
 2010-01-21 11:18:18 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
f9c781a73f bug #2883633 [export] Export of InnoDB table is incomplete 2009-10-23 16:50:39 +00:00
Marc Delisle
f038959b4f bug #2839548 [export] Triggers order on export 2009-08-30 12:43:07 +00:00
Marc Delisle
0214a6fe9d patch #2773818 [export] Invalid "Content-Encoding" header 2009-05-03 17:03:47 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
6208585d04 no longer useful since all lang files are UTF-8 2008-10-01 20:48:40 +00:00
Marc Delisle
91ae7b67bd various code improvements, thanks to Piotr Przybylski 2008-08-16 12:17:52 +00:00
Marc Delisle
9ff701560f bug #2032707 [core] PMA does not start if ini_set() is disabled 2008-08-01 19:15:01 +00:00
Marc Delisle
7146b10226 this header should not harm other browsers 2008-07-21 14:41:56 +00:00
Marc Delisle
6e38a22283 patch #2020630 [export] Safari and timedate 2008-07-18 17:42:52 +00:00
Marc Delisle
4e76dc40a3 improved fix for bug 1996943 2008-06-20 17:53:30 +00:00
Marc Delisle
667300c989 typo 2008-06-19 12:32:07 +00:00
Marc Delisle
be10c2988f bug #1996943 [export] Firefox 3 and .sql.gz (corrupted) 2008-06-19 12:29:48 +00:00
Marc Delisle
6554e9893a bug #1981043 [export] HTML in exports getting corrupted 2008-06-01 12:15:23 +00:00
Sebastian Mendel
fa21fe3ea5 make the database list more magic: 
load/fetch only if really required
use SPL ArrayObject to behave like an array
 2008-05-09 10:41:16 +00:00
Marc Delisle
aa0a464f10 bug #1804081 [export] export on server does not obey AllowAnyWhereRecoding 2007-11-10 15:20:59 +00:00
Sebastian Mendel
6ee1069a9c make use of PMA_Message 2007-10-17 10:08:21 +00:00
Sebastian Mendel
107fc46ad9 make use of PMA_Message 2007-10-16 12:14:19 +00:00