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

162 Commits

Author SHA1 Message Date
Marc Delisle
6f8a253daf Merge pull request #1407 from madhuracj/tokenMismatch 
Workaround for token mismatch error on server session timeout for config and http authentication types
 2014-11-26 07:42:46 -05:00
Madhura Jayaratne
783cacbd1e 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-20 17:37:39 +05:30
Michal Čihař
c11efb678d This is binary string, can not use mb_strlen 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:28:53 +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
Hugues Peccatte
a68ea85d4d Remove unused locale variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 23:26:57 +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
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Madhura Jayaratne
8785ea0e34 Adjust tests for commit 3ec96cb038 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-19 08:22:06 +05:30
Madhura Jayaratne
aaa2116b01 Fix some of the failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 21:59:33 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Madhura Jayaratne
603b31d023 Revert "The DisableIS directive is being deprecated" 
This reverts commit 57ef25eed8.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:30:16 +05:30
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30
Hugues Peccatte
bb85376b89 Minor PHPDoc modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-30 21:50:20 +02:00
Hugues Peccatte
0ee7063220 Replace PMA_String calls by mb_* calls in tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-29 18:52:54 +02:00
Marc Delisle
fde42eb2e8 No need to have a distinct file 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-06 14:11:04 -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
Hugues Peccatte
4960f208e2 Add PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-30 21:14:30 +02:00
Marc Delisle
e3fb12e385 Merge commit '3b479f5' 2014-08-28 15:43:36 -04:00
Smita Kumari
3b479f52f9 fix unit test 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 22:48:35 +05:30
Marc Delisle
8537e1d966 Merge commit '5681db5' 2014-08-14 12:08:12 -04:00
Smita Kumari
5681db5084 fix bug #4516 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-14 20:55:02 +05:30
Hugues Peccatte
8558047094 Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-09 23:21:13 +02:00
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Chirayu Chiripal
871ad6d8ab update transformation path in getInfo method 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-24 14:14:03 +05:30
Chirayu Chiripal
43c289ab56 Combined transformation plugins test to avoid duplication issues 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-13 17:46:22 +05:30
Marc Delisle
56659dfa8c Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-13 07:58:43 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Michal Čihař
6be21dcb47 Merge pull request #1251 from WhaleWatching/console 
PMA console, history and bookmarks.
 2014-06-25 15:37:29 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00
Michal Čihař
74e499a3d2 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-25 09:25:02 +02:00
Chirayu Chiripal
48b0bfd259 no need to disable contructor of SplObjectStorage 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 09:24:19 +02:00
Chirayu Chiripal
a78a7a0c9c export with table/column names changes extended for other export formats 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-18 16:09:57 +05:30
Michal Čihař
51d4d514f9 Adjust tests to new encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
a7bcbbc35f Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:51:29 +02:00
Michal Čihař
20640592f0 Always use phpseclib for cookie encryption 
- it provides fallback in case mcrypt is not found
- we now use AES in both mcrypt and PHP code case
- cleanup the code by removing mcrypt conditials
- rename some methods and cookies so that they don't refer to
  implementation details
- switching encryption implementations no longer invalidates the
  credentials

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:39:52 +02:00
Michal Čihař
0652ca9ccd Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 10:19:00 +02:00
Michal Čihař
bc60315023 Adjust tests to new IV logic 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:18:45 +02:00
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
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ř
c9dc5611ee Fix type string for longtext 
It has to be checked before "long", otherwise it matches first.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:46:34 +02:00
Michal Čihař
3e4da830ee Correctly set static properties in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:01:14 +02:00
Marc Delisle
c8e33b2a96 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:59:55 -04:00
Marc Delisle
84f135d048 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:40:21 -04:00
Marc Delisle
49f1bdd822 Merge commit '0ee881d' 2014-05-16 12:20:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 09:56:47 -04:00
Michal Čihař
3eccb9eb26 Improve signon-script example 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
8bc5e560e8 Uset errno before testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:19:59 +02:00
Michal Čihař
2a66d750a4 Use correct mock value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:11:30 +02:00