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

582 Commits

Author SHA1 Message Date
Madhura Jayaratne
677da2906c bug #4706 Schema export doesn't handle dots in db/table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-04 15:11:05 +05:30
Madhura Jayaratne
aea519fded bug #4707 Call to undefined method PMA_Schema_PDF::dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-14 19:30:00 +05:30
Madhura Jayaratne
9524db89ce bug #4703 Unsaved schema page exported as pdf.pdf 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:00:13 +05:30
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 12:53:12 +05:30
Hugues Peccatte
2dcb1c9b0a Fix #4645 Import of export created with mysqldump 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-21 22:57:25 +01:00
Madhura Jayaratne
7de549b7f3 bug #4639 Export SQL missing indentation first field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:45:56 +05:30
Madhura Jayaratne
077916c82a bug #3794 failure to handle repeating empty columns when importing ODS 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:18:28 +05:30
Madhura Jayaratne
3eb3ce396b bug #4628 PHP error while exporting schema as PDF 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 12:36:52 +05:30
Robert Scheck
d9468e3fff Bug #4623 Incomplete PHP OpenSSL support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 06:37:15 -05:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:50:14 -05:00
Madhura Jayaratne
eb79ad9181 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:09:04 +05:30
Madhura Jayaratne
ea7ca462e5 Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:57:19 +05:30
Madhura Jayaratne
5e1ab952b8 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:52 +05:30
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:28 +05:30
Michal ฤŒihaล™
8fc377d83a Share code for resetting IV size 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-11-20 10:27:01 +01:00
Michal ฤŒihaล™
5f1a5a78bc Shared check for OpenSSL support 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-11-20 10:14:47 +01:00
Robert Scheck
491c426623 Patch by Robert Scheck <robert@fedoraproject.org> for phpMyAdmin 4.2.6 
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-19 07:38:32 -05:00
Madhura Jayaratne
79145b4e50 $db is not defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 12:10:05 +05:30
Madhura Jayaratne
f8d68e6272 Eliminate duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 20:49:11 +05:30
Madhura Jayaratne
ac450e7853 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-11 18:06:15 +05:30
Madhura Jayaratne
b6f0d923b2 More long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 18:01:58 +05:30
Hugues Peccatte
a0f348beea Merge branch 'removeUnusedVariables_master' 2014-11-11 10:02:54 +01:00
Hugues Peccatte
b61ea0a10c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-10 23:28:33 +01:00
Hugues Peccatte
13b5690bac Fix typo in class name. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 23:28:19 +01:00
Hugues Peccatte
a68ea85d4d Remove unused locale variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 23:26:57 +01:00
Nisarg Jhaveri
fb130bf20d Fixed typo in SQL export 
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-11-11 00:47:38 +05:30
Hugues Peccatte
58c629f6fd Merge branch 'master' into b4495_master 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
 2014-11-10 13:48:33 +01:00
Hugues Peccatte
ed51a25c8f Allow import SQL without delimiter till EOF. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 22:54:44 +01:00
Hugues Peccatte
fe3941b9bd Fix #4495 Comment lines in multiquery 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 20:02:10 +01:00
Hugues Peccatte
93c86da700 Minor style modifications. 
PHPDoc update.
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 17:34:10 +01:00
Hugues Peccatte
6827afb2bd Replace parameters by class attributes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 15:36:21 +01:00
Hugues Peccatte
aa9700de68 Replace parameters by class attributes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 15:25:40 +01:00
Madhura Jayaratne
0bca6a096f Determine the databases the user has access to based on GRANTs and query only for them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 08:13:58 +05:30
Hugues Peccatte
f15e658b56 Fix wrong test in ImportMediawiki. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 19:38:04 +01:00
Hugues Peccatte
42e0bdd47a Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 18:32:42 +01:00
Hugues Peccatte
01ffac5f39 Refactor code in ImportMediawiki.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 15:18:06 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:52:20 +01:00
Hugues Peccatte
fd7f02f929 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:33:41 +01:00
Hugues Peccatte
58ed27560c Reverse modification to fix PHPUnit issue. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:10:51 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Hugues Peccatte
c0b0dc2e35 Add PHPDoc comments in ImportSql.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 19:54:36 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +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
Hugues Peccatte
3b3017d7ae Manage SQL display. 
Rename attributes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 22:13:28 +01:00
Hugues Peccatte
3301bc3c8e Display delimiter into SQL trace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 21:48:51 +01:00