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

106375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
e922991f33 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-13 11:18:32 +01:00
Michal Čihař
2b134240b8 Share code for session cache key calculation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:17:58 +01:00
Michal Čihař
665a5fcbe2 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-13 10:55:08 +01:00
Michal Čihař
8d5939348e Use current user in session cache key 
This makes it automatically valid only for current user.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:54:08 +01:00
Michal Čihař
f18e02b16d Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:40:52 +01:00
Michal Čihař
7c737eeb72 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 10:39:55 +01:00
Michal Čihař
4fc04f3938 Adjust tests to new setup handling of messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:39:02 +01:00
Michal Čihař
be8eb4bf3e Merge commit '90e4325bcf' into QA_4_6-security 2016-12-13 10:31:43 +01:00
Weblate
353358c1f4 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 10:31:41 +01:00
Laura Arjona Reina
7cccdd022c Translated using Weblate (Spanish) 
Currently translated at 99.8% (3218 of 3222 strings)

[CI skip]
 2016-12-13 10:31:41 +01:00
Michal Čihař
90e4325bcf Rewrite https in setup and messages handling 
- The client side check is more reliable
- Does not depend on server setup
- Removed related inline javascript (see #12261)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:31:25 +01:00
jorge jansen abreu
685b51d5d5 Translated using Weblate (Spanish) 
Currently translated at 99.8% (3216 of 3222 strings)

[CI skip]
 2016-12-13 10:25:44 +01:00
Laura Arjona Reina
7ae3259b64 Translated using Weblate (Spanish) 
Currently translated at 99.7% (3215 of 3222 strings)

[CI skip]
 2016-12-13 10:25:21 +01:00
Michal Čihař
2086bb61c1 Add changelog entry for PHP 7.1 compatibility 
Fixes #12800

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 09:21:48 +01:00
Michal Čihař
569a4d280c Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 09:04:16 +01:00
Michal Čihař
28968fe919 Set correct Uptime value for tests 
MySQL returns this as integer, so we should do the same for tests.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 09:04:10 +01:00
Michal Čihař
1fd24b650d Update phpSecLib to 2.0.4 
* fix E_DEPRECATED errors on PHP 7.1
* Random: fix issues with serialize()

Issue #12800

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:43:52 +01:00
Michal Čihař
cb6d733e5a Fix other places of wrong value for # in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Deven Bansod
ffaf589a26 Fix numeric errors 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
9f5789dff8 Set reasonable mock value for tests 
Set integer where we do a COUNT() SQL.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
48144987d8 Ensure font size is integer, we do further calculations with it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
034047a219 There is no runkit for 7.1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
1308ecccd0 Enable testing in PHP 7.1 
I hoped there will be phpMyAdmin 4.7.0 by time PHP 7.1 is out, but
obviously that's not the case, so we should fix 4.6 branch as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:23:46 +01:00
Michal Čihař
c72b1563d1 Fix various broken or outdated links 
Backported from master

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 07:59:07 +01:00
Michal Čihař
14c8214bb4 Merge remote-tracking branch 'origin/pull/12805' into QA_4_6 2016-12-13 07:55:40 +01:00
Isaac Bennetch
78af58dd0a Improve documentation for servers with Suhosin; issue #12434 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-12 19:55:36 -05:00
Lucie Procházková
de4fb44eeb Translated using Weblate (Czech) 
Currently translated at 93.3% (3008 of 3222 strings)

[CI skip]
 2016-12-13 00:44:31 +01:00
Michal Čihař
7b5c2699f6 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-08 13:18:02 +01:00
Michal Čihař
9693522a86 Revert "Use unserialize without objects if available" 
This reverts commit d61dbc1d6f.

Honestly I don't think this work as documented:

PHP Warning:  unserialize() expects parameter 2 to be array, boolean given
 2016-12-08 13:17:03 +01:00
Michal Čihař
053e73d0c3 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-08 12:04:38 +01:00
Michal Čihař
d61dbc1d6f Use unserialize without objects if available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 12:04:05 +01:00
Michal Čihař
3b6ed1f9ec Improve PHP path cleanup 
- properly handle situation when query string contains PATH_INFO
- cleanup path from any relative parts

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:56:46 +01:00
Michal Čihař
fe394c90a8 Merge branch 'QA_4_6' into QA_4_6-security 2016-12-08 11:42:50 +01:00
Michal Čihař
f2bfa7d745 Avoid running shell scripts as CGI 
There is really no reason for that besides misconfigured servers.

This is followup for PMASA-2016-54

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:41:42 +01:00
Michal Čihař
3a6247674e Do not provide fallback to cookie for font size 
* This should be already handled by Config class
* Injecting cookie value to CSS could be security risk

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:28:03 +01:00
Michal Čihař
a134a01177 Avoid infinite recursion on goto 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:20:10 +01:00
Michal Čihař
ec6c55c1df Add missing ; 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:06:10 +01:00
Michal Čihař
e37bf40f44 Avoid using REQUEST_URI for redirection 
* Stick with PMA_sendHeaderLocation to handle server weirdness
* Use already calculated URL

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:59:53 +01:00
Michal Čihař
9d712359d0 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:56:42 +01:00
Michal Čihař
4c84070ad6 Avoid using REQUEST_URI in form action 
It's really not necessary here and might cause redirection issues.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:49:06 +01:00
Michal Čihař
96b4f13e54 Quote table name for use in regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:23:57 +01:00
Michal Čihař
3c9d440990 Merge remote-tracking branch 'security/pull/217' into QA_4_6-security 2016-12-08 10:18:11 +01:00
Michal Čihař
62517b08e2 Merge remote-tracking branch 'security/pull/218' into QA_4_6-security 2016-12-08 10:16:06 +01:00
Michal Čihař
5f558b0a1d Add openssl to sugest 
Issue #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:56:39 +01:00
Michal Čihař
d7e7a06535 Add pcre to deps 
Issue #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:55:02 +01:00
Michal Čihař
4df65209a1 Add information about required and suggested extensions to composer.json 
Fixes #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:52:55 +01:00
Michal Čihař
14a1a69a78 Fixed javascript error on new version link 
Fixes #12792

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:44:42 +01:00
Weblate
108b52f599 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-07 09:43:46 +01:00
Jörn Gorres
afb5051fc4 Translated using Weblate (German) 
Currently translated at 99.4% (3205 of 3222 strings)

[CI skip]
 2016-12-07 09:43:44 +01:00
Michal Čihař
1ae6275be7 Fix wrong parameter to escapeString 
These come from f14cffd

Fixes #12786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 09:38:57 +01:00