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

409 Commits

Author SHA1 Message Date
Michal Čihař
7089858ab0 Allow to use system phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-07-08 16:29:54 +02:00
Michal Čihař
e6f6dab3b0 Fixed cookie based login for installations without mcrypt 
bug #4469

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 14:08:03 +02:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +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
Michal Čihař
953c7415ad Separate check for password cookie 
Otherwise it would not be possible to recall user name.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:47:04 +02:00
Michal Čihař
7cba81de27 Regenerate cookie encryption IV for every session 
The IV for cookie encryption was generated just once for every browser
and kept in a cookie. Generating it for every session is much better to
avoid information leaks (eg. that same user has logged in).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:41:27 +02:00
Michal Čihař
b252cb9981 Use better source of entropy for mcrypt IV 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:16:20 +02: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
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
Ann + J.M
d9bd81a2a1 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:40:24 +02:00
Marc Delisle
e813cab608 bug #4418 When copying databases, primary key attributes get lost 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:22:14 -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ř
b177557c11 Use preg_quote instead of home made replacement to quote string for preg 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:35:49 +02:00
Marc Delisle
89f21f5109 About bug #4280: try to workaround PHP 5 session garbage collection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-24 09:15:03 -04:00
Hugues Peccatte
e512768fce Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-18 18:51:04 +02:00
Hugues Peccatte
b61c12bff1 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-18 10:19:58 +02:00
Marc Delisle
cb3929766a Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-25 06:18:21 -04:00
Michal Čihař
186a80939d Allow TCPDF to be removed 
We currently require TCPDF to be present, but in most cases this is
feature which users do not need and thus can reduce size of installed
phpMyAdmin.

Also this is helpful for Linux distributions as they can provide soft
dependency on tcpdf package.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-24 16:12:13 +01:00
Marc Delisle
bab0572c1e Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-21 12:42:10 -04:00
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Hugues Peccatte
3f546b010d PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 15:52:00 +01:00
Hugues Peccatte
c38b78defb PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:46:16 +01:00
Hugues Peccatte
9b1f025fb7 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 23:06:46 +01:00
Hugues Peccatte
db23a9bf8a PHPCS and PHPdoc updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-13 21:40:39 +01:00
Marc Delisle
8e066c5105 Merge branch 'QA_4_1' 2014-03-09 07:41:14 -04:00
Marc Delisle
5fdb93de0a Fix comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-09 07:40:33 -04:00
Dhananjay Nakrani
76c57710f0 Display session expiry msg after auto-redirect. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-03-03 11:49:17 +05:30
Marc Delisle
b50ed1aac4 Merge commit '65e24c0' 2014-03-02 09:41:02 -05:00
Marc Delisle
8c795aede7 Merge commit '089b382' 2014-03-02 09:40:49 -05:00
Chirayu Chiripal
dec30ffd6d Feature Request #1460 Redirect to login page after session has expired 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-02-27 17:45:46 +05:30
Smita Kumari
65e24c0b0a bug fix #4298: added javascript allow just one character if first character is not escape character else allow two including escape character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-27 00:21:03 +05:30
Smita Kumari
089b382e22 bug fix #4298:ImportCSV options UI validation includes "Columns separated with" allows string while "Columns enclosed with" and "Columns escaped with" allow to enter just one character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 19:32:31 +05:30
Marc Delisle
d30b1d314d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-26 07:33:52 -05:00
Smita Kumari
a8052ee602 adding explanation to parameter names 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 17:19:56 +05:30
Smita Kumari
6f095c8a3c Feature Request #1418, added new function docblock 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 00:12:19 +05:30
Marc Delisle
e08c4449e6 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:38:54 -05:00
Smita Kumari
66952d75b1 Implemented Feature request #1418: using string as Column_Sepearted_With parameter 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:26:47 -05:00
Madhura Jayaratne
f65ac8803e Merge branch 'QA_4_1' 2014-02-08 13:06:10 +05:30
Madhura Jayaratne
59e3c9474a bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 13:04:32 +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
Viduranga Wijesooriya
4c1b38ddf2 fixed loosing of auto increment value when exporting sql 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-05 17:26:19 +05:30
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
Viduranga Wijesooriya
641fa53789 fixed #4261 Export bug 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-04 19:03:46 +05:30
Marc Delisle
f5ba57c290 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:11:44 -05:00
Marc Delisle
c406599995 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:10:53 -05:00
Marc Delisle
464616c26b Merge commit '36e544c' 2014-02-03 08:44:37 -05:00
Marc Delisle
36e544ce9e Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 08:42:39 -05:00
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
c6969bfb9e Properly encode & in URL 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 09:00:05 +01:00