Commit Graph

11454 Commits

Author SHA1 Message Date
Atul Pratap Singh
2e76e83408 Fix bug 4483/4440: selflink was disappearing in certain cases
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-07-08 20:05:46 +05:30
Michal Čihař
7089858ab0 Allow to use system phpseclib
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-07-08 16:29:54 +02:00
Marc Delisle
eb468f4786 bug #4481 mult_submits.inc.php Undefined variable Error
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-07 18:00:47 -04:00
Marc Delisle
ca9ad6015a Undefined variable when grid editing a foreign key column
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-07 06:35:30 -04:00
Cezary H. Noweta
0314678985 bug #4478 Server validation does not work while in setup/mysqli
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-05 09:28:06 -04:00
Atul Pratap Singh
2819506bb0 Have single-sort url besides multi-sort for each column and make single-sort default on click
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-07-01 23:32:05 +05:30
Marc Delisle
5b1fe4e55f Add comments and todo for the justBrowsing logic
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:22:53 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:14:39 -04:00
Hugues Peccatte
920f83da2d Fix #4471: Undefined index warning with referenced column.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-06-26 21:03:17 +02:00
Marc Delisle
d8b3f9a766 4.2.6-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-26 10:01:48 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-26 09:56:24 -04:00
Marc Delisle
e0933c8cba Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-25 13:03:44 -04: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
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-25 14:24:57 +05:30
Marc Delisle
2a807fe073 Merge pull request #1248 from Tithugues/QA_4_2_b4463
Add missing include. (bug #4463)
2014-06-23 11:56:06 -04:00
Hugues Peccatte
1fb1093d0d Add missing include. (bug #4463)
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-06-22 22:51:13 +02:00
Ann + J.M
46091ff2e2 Fix coding style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-22 17:28:43 +02:00
Ann + J.M
1fd8fde4ca Fix failing tests
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-22 16:49:17 +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
Marc Delisle
a30405fe0b bug #4467 shell_exec() has been disabled for security reasons
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-20 15:39:09 -04:00
Marc Delisle
782fe7a1e5 Merge commit 'd4f754c' into QA_4_2 2014-06-20 12:38:43 -04:00
Marc Delisle
aebfcfdc9f 4.2.5-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-20 08:47:51 -04:00
Ann + J.M
d4f754c937 Fix XSS in Hide navigation items feature
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-19 12:57:59 +02:00
Ann + J.M
d18a2dd9fa Fix XSS in PMA_RecentFavoriteTable::getHtmlList()
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-19 12:52:52 +02:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-15 10:07:38 -04:00
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-13 00:39:28 +05:30
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-12 16:55:27 +05:30
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
Michal Čihař
e71869daf1 Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2
Conflicts:
	ChangeLog
2014-06-10 09:15:00 +02:00
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
Hugues Peccatte
b55719206b Remove SQL format for multi-table queries.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-06-09 15:27:40 +02:00
Marc Delisle
199982f0d0 4.2.4-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-08 18:35:23 -04:00
Marc Delisle
e2ce71566f Missing space in index creation/edit generated query
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-07 09:31:17 -04:00
Marc Delisle
9342cc6709 Incorrect menu tab generation from usergroups
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-07 09:02:10 -04:00
Ann + J.M
42a65a5ab6 Trim some trailing space
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-06 20:46:14 +02:00
Ann + J.M
cb7c703c03 Fix XSS in recent/favorite tables list feature
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-06 18:40:19 +02:00
Marc Delisle
2fd9dad403 Merge pull request #1208 from smita786/QA_4_2
Bug fix:Query error on submitting column change form containing disabled...
2014-06-06 08:07:46 -04:00
Smita Kumari
1b5901f45e Bug fix:Query error on submitting column change form containing disabled input
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-06 01:03:59 +05:30
Marc Delisle
94e43de453 Add enforcement of the minimum supported PHP version (5.3.0)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-05 12:44:34 -04:00
Marc Delisle
9112d7c930 bug #4437 Problems due to missing enforcement of the minimum supported MySQL version
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-05 12:27:03 -04:00
Madhura Jayaratne
2e645ede7f bug #4436 Insert form numeric field with function drop-down list
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-06-05 16:47:41 +05:30
Marc Delisle
e5367c1c40 bug #4433 Missing privileges submenu
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-31 11:41:10 -04:00
Marc Delisle
60fca63630 Missing message for /setup
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-24 09:05:10 -04:00
Ann + J.M
5facff36bd Add missing break in # comment detection switch
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-21 21:43:20 +02:00
Ann + J.M
524e82e33c Extrace query cache total blocks value correctly
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-21 21:34:21 +02:00
Ann + J.M
daaf70bca2 Rename OptionsPropertyOneItem::$_force overwritten from parent
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-21 21:29:51 +02:00