Commit Graph

15996 Commits

Author SHA1 Message Date
Michal Čihař
62d417db9b Merge branch 'QA_4_6' 2016-06-09 09:20:26 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-09 09:19:55 +02:00
Michal Čihař
e6ff157dda The session_destroy is already called on logout
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-08 15:30:55 +02:00
Michal Čihař
0b2b23f2ce Merge branch 'QA_4_6' 2016-06-08 14:00:26 +02:00
Michal Čihař
d7fcbab1cd Ensure we parse query for views as well
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-08 14:00:04 +02:00
Madhura Jayaratne
d4932fbb88 Merge branch 'QA_4_6' 2016-06-06 23:59:21 +10:00
Madhura Jayaratne
c4e7447a96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281
Conflicts:
	ChangeLog
2016-06-06 23:23:07 +10:00
Madhura Jayaratne
1c77a4ef0d Fix #12281 Copying a user resets SSL to None
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-06-06 23:17:20 +10:00
Michal Čihař
7a66320753 Merge branch 'QA_4_6' 2016-06-06 13:54:53 +02:00
Michal Čihař
4fd2709650 Avoid rewriting PHP stack frames
Surprisingly PHP stack frames are passed as references to the error
handling code, thus changing value there leads to changing value in the
executed code.

With MySQL issuing warning about incompatible version (different runtime
library than compile time), handling this warning rewrites current stack
frame and the mysql_real_connect later sees parameters as processed by
Error class for display.

We now create copy of the stacktrace to avoid this.

Fixes #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 13:52:32 +02:00
Michal Čihař
5bc426742d Merge branch 'QA_4_6' 2016-06-06 11:47:37 +02:00
Michal Čihař
5e536ab5f9 Do not set key if not set in config
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 11:47:16 +02:00
Michal Čihař
8ee70dfa08 Merge branch 'QA_4_6' 2016-06-06 09:33:22 +02:00
Michal Čihař
171bcb9a85 Fix MySQL SSL connection with some PHP versions
It seems that for some PHP versions this flag is needed even though it's
not documented like this. Anyway this flag doesn't cause any harm, so
lets keep it enabled.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 09:32:47 +02:00
Michal Čihař
f3925a8b7c Merge branch 'QA_4_6' 2016-06-03 15:22:29 +02:00
Michal Čihař
2ae8b9248e Simplify server port handling
The intval function does return 0 for empty string, so we really do not
have to special case here.

Issue #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-03 15:21:48 +02:00
Michal Čihař
8a494f26d2 Merge branch 'QA_4_6' 2016-06-03 14:42:07 +02:00
Michal Čihař
b49030528f Fixed export of tables without explicitly set engine
Fixes #12290

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-03 14:41:55 +02:00
Michal Čihař
e9614da53a Merge branch 'QA_4_6' 2016-06-03 14:32:00 +02:00
Michal Čihař
d11185f5de Fixed error reporting on connect problems
The mysqli_real_connect seems to return NULL on invalid parameters, so
we need to handle it as well. This doesn't seem to be documented
anywhere.

Issue #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-03 14:24:45 +02:00
Michal Čihař
c4a7ec4650 Merge pull request #12274 from sfobiwahn/master
fixed checking of user rights to make it look for database privileges
2016-05-27 15:32:14 +02:00
Michal Čihař
8678125b6a Merge pull request #12275 from andavies/issue-#12262
Remove inline styles from elements with id='filterText' (partial fix …
2016-05-27 15:31:39 +02:00
Michal Čihař
ab29ec9947 Merge branch 'QA_4_6' 2016-05-27 11:12:58 +02:00
Michal Čihař
d78e173b34 Do not use dirname for calculating cookie path
It is wrong for this purpose as on Windows this uses \ for both
separating parts and generating result. This fixed calculation of cookie
path on Windows.

Fixes #12249

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-27 11:11:56 +02:00
Andy Davies
786786d602 Remove inline styles from elements with id='filterText' (partial fix of issue #12262)
Signed-off-by: Andy Davies <contact@andy-davies.me>
2016-05-26 18:02:26 +01:00
sfobiwahn
df137f2410 fixed checking of user rights to make it look for database privileges
Signed-off-by: Florian Steenblock <florian.steenblock@gmail.com>
2016-05-26 17:10:57 +02:00
Isaac Bennetch
5c6ec27eea Prepare for 4.6.3-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-25 14:36:58 -04:00
Isaac Bennetch
c1c75f8c35 4.6.2 release
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-25 12:16:14 -04:00
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