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

563 Commits

Author SHA1 Message Date
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
Hugues Peccatte
e85b43b8b2 Remove unused variable. 
Rename parameter.
Update PHPDoc.
Fix data parsing.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 20:39:56 +01:00
Hugues Peccatte
ba346c2731 Manage data as an attribute. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-26 17:11:40 +01:00
Hugues Peccatte
c8b10dad32 Improve data parsing. 
Fix DELIMITER detection issue.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-26 14:53:42 +01:00
Hugues Peccatte
1cbfa5612e Refactor some code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 18:39:10 +02:00
Hugues Peccatte
b857bc0c92 Log query while importing SQL. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 16:53:05 +02:00
Hugues Peccatte
4060c08848 Fix import. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 13:09:50 +02:00
Hugues Peccatte
f53f940366 Refactor. 
Remove useless method.
Update comments.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 13:04:07 +02:00
Hugues Peccatte
bbe0cc9c3c Manage errors in import process. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:42:19 +02:00
Hugues Peccatte
dec77b5796 Remove old import process. 
Minor coding stylo modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:38:11 +02:00
Hugues Peccatte
35bbe992d0 Remove var_dump. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:32:13 +02:00
Hugues Peccatte
14bda32169 Fix delimiter reading. 
Rum last SQL query.
Fix SQL reading.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:23:15 +02:00
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 16:58:00 +02:00
Hugues Peccatte
3363f10880 Rename ImportSQL method. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 21:06:17 +02:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
9680410019 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-19 10:13:07 -04:00
Hugues Peccatte
4b9058faa9 Manage escaped quotes. 
Improve process not to look for the same thing many times.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 23:57:54 +02:00
Hugues Peccatte
d936df12d2 Manage option to read SQL as a multibytes string or not. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 20:31:54 +02:00
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02: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