1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Commit Graph

15968 Commits

Author SHA1 Message Date
Michal Čihař
9d5c5f0c86 Adjust tests to new error messages
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 21:27:41 +02:00
Michal Čihař
8ba932da58 Merge branch 'QA_4_6' 2016-05-23 17:38:00 +02:00
Michal Čihař
e1f8c36c79 Fix class namespace
Fixes loading of APC based upload progress bar

Fixes #12248

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:37:38 +02:00
Michal Čihař
4cd8ab8a95 Better report errors while generating SQL exports
The errors will include table and database name in the dump and the
error is also shown in the UI on next page.

Fixes #5555

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:21:58 +02:00
Michal Čihař
40b80d883d Merge branch 'QA_4_6' 2016-05-23 17:16:35 +02:00
Michal Čihař
66f774787f Do not fail on errors stored in session
If there is user error stored in session, it would be treated as session
startup error, what is wrong.

Fixes #12229

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:15:23 +02:00
Michal Čihař
0816b47b3d Document cookie exipiry times
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 16:40:51 +02:00
Michal Čihař
d7d9925e11 Merge branch 'QA_4_6' 2016-05-23 16:10:34 +02:00
Michal Čihař
ec11ed59be Add session reload for config authentication
It is for free with new logout handling (since
11eb574242).

Fixes #11565

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 16:10:07 +02:00
Michal Čihař
1d1e269144 Merge branch 'QA_4_6' 2016-05-23 15:54:33 +02:00
Michal Čihař
3b374237d6 Fixed export of ARCHIVE tables with keys
We can not rewrite the ARCHIVE table as it can not be altered.

Fixes #12082

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 15:54:26 +02:00
Michal Čihař
0be789c845 Merge branch 'QA_4_6' 2016-05-23 15:25:38 +02:00
Michal Čihař
cb2ec8210d Avoid storing full error data in session
The arguments of called functions can be huge or cause problems on session
restore. More importantly we never need them as they are, we only need
them to display them as text, so let's store only this representation in
the session.

Fixes #12192

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 15:25:22 +02:00
Michal Čihař
d88faaf42b Remove unused code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 15:25:22 +02:00
Michal Čihař
d8123662cc Merge branch 'QA_4_6' 2016-05-23 15:10:28 +02:00
Michal Čihař
fe225ac49d Do not try to sync favorite tables without server
Fixes #12209

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 15:10:19 +02:00
Michal Čihař
d798ef6c7b Merge branch 'QA_4_6' 2016-05-23 15:01:09 +02:00
Michal Čihař
6408c367fa Do not try to secure session in testsuite
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 15:00:57 +02:00
Michal Čihař
efc89f9fbc Merge branch 'QA_4_6' 2016-05-23 14:28:33 +02:00
Michal Čihař
f978e347fb Add missing requie once for testsuite
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 14:28:28 +02:00
Michal Čihař
b52bd77987 Merge branch 'QA_4_6' 2016-05-23 13:49:00 +02:00
Michal Čihař
f9d6c40939 Safer handling of sessions during authentication
- always generate new session for login form
- always generate new session when authenticated using cookie auth

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 13:48:25 +02:00
Michal Čihař
318d3ac934 Merge branch 'QA_4_6' 2016-05-23 13:37:00 +02:00
Michal Čihař
84fbe2c758 Do not remove globals on parameters cleanup
This code is there probably since register_globals times and is no
longer necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 13:36:49 +02:00
Michal Čihař
792f5dc794 Merge branch 'QA_4_6' 2016-05-23 13:23:43 +02:00
Michal Čihař
adfd5a22b9 Avoid double redirects in signon auth on logout
Also adjusts tests to no longer rely on runkit.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 13:23:16 +02:00
Michal Čihař
e3d650a2bb Merge branch 'QA_4_6' 2016-05-23 13:05:01 +02:00
Michal Čihař
11eb574242 Improve handling of logout
- add separate script for handling logout
- no longer require old_usr for all authentication methods
  (this avoids potential information leak)
- require valid token for logout

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 13:02:21 +02:00
Michal Čihař
21db724c85 Remove need for having define for test
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 12:09:36 +02:00
Michal Čihař
cf97a33ffb Ignore args in the debug backtrace
This heavily reduces memory usage and also avoids potential information
leak.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 12:01:02 +02:00
Michal Čihař
c4947d5f42 Merge branch 'QA_4_6' 2016-05-23 10:55:13 +02:00
Michal Čihař
7feb606d7f Avoid confusing warning when mysql extension is missing
As mysql extension is deprecated and removed from PHP 7, it makes no
sense to recommend it.

Fixes #12231

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 10:53:13 +02:00
Michal Čihař
42f94b05e2 Merge branch 'QA_4_6' 2016-05-23 09:40:56 +02:00
Michal Čihař
5fc8020c5b Ensure links from setup go through url.php
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 09:40:17 +02:00
Michal Čihař
5bb7349e0d Merge branch 'QA_4_6' 2016-05-23 09:21:33 +02:00
Michal Čihař
b061096abd Avoid not neeedded urlencode/urldecode steps in multi submits
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 09:12:52 +02:00
Michal Čihař
6d4bd77745 Avoid not needed urlencode/urldecode for bookmarked SQL query
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 09:12:52 +02:00
Michal Čihař
49a1db045e Merge branch 'QA_4_6' 2016-05-23 08:43:51 +02:00
Michal Čihař
24bb12793d Fix locking issues when importing SQL
When running import (or generally any SQL query), some tables might be
locked. This will cause queries to not locked tables to fail. And this
is exacly what we do with control user link.

So let's have separate link for control queries even if we're using same
credentials as for main link.

Fixes #12219

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 08:42:08 +02:00
Michal Čihař
45516b5cfe Merge branch 'QA_4_6' 2016-05-17 12:01:10 +02:00
Michal Čihař
532b3c6544 Replace links in wiki by links to documentation
The wiki is getting outdated, it's better to link to documentation
instead.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 11:57:48 +02:00
Michal Čihař
506fd28cbd Add support to link directly to some page
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 11:54:28 +02:00
Michal Čihař
a6b7349214 Fix doc linkst for config
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 11:45:10 +02:00
Michal Čihař
3c3642cd17 Merge branch 'QA_4_6' 2016-05-17 10:57:48 +02:00
Michal Čihař
677f727617 Remove non working links from config option descriptions
These links are not working since 4.2.0 and nobody complained, so I
assume they are really not needed.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:57:09 +02:00
Michal Čihař
a2b8bfc308 Merge branch 'QA_4_6' 2016-05-17 10:50:16 +02:00
Michal Čihař
b0f8511e60 Use https for links to www.phpmyadmin.net
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:49:21 +02:00
Michal Čihař
98ad7d1ba4 Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:42:37 +02:00
Michal Čihař
05a45fe23f Use https for links to bugs.mysql.com
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:41:13 +02:00
Michal Čihař
0982a6a424 Better laben Percona
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:39:33 +02:00