gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,989 Commits 12 Branches 481 Tags 2.4 GiB
22e5f4a4be
Commit Graph

104989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
22e5f4a4be Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 21:07:07 +01:00
Michal Čihař
a28cc6d2de Ensure we always restore original instance even on failure 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:41:00 +01:00
Michal Čihař
b846681c26 Correctly mock Response instance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:30:07 +01:00
Michal Čihař
9bd4844c26 Do not skip test if IIS is defined 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:26:45 +01:00
Michal Čihař
1bddcff0d5 Remove accidental comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:22:49 +01:00
Michal Čihař
2148e7cad8 Implement test for Cookie auth without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:21:40 +01:00
Michal Čihař
be8b4ccd76 Add mising separator 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:57:42 +01:00
Weblate
0be1869339 Merge remote-tracking branch 'origin/master' 2016-02-03 19:56:44 +01:00
Pedro Moreira
8618600876 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.2% (2936 of 3216 strings)

[CI skip]
 2016-02-03 19:56:43 +01:00
Michal Čihař
e3843ab1a9 Test with SID if set 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:56:26 +01:00
Weblate
2402a0b053 Merge remote-tracking branch 'origin/master' 2016-02-03 19:49:18 +01:00
Pedro Moreira
5e0dc6b139 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.2% (2935 of 3216 strings)

[CI skip]
 2016-02-03 19:49:16 +01:00
Michal Čihař
c2b41b829a Wrap header() and headers_sent() in response 
This allows us to test the code without using runkit. Currenly only
AuthenticationHttp is migrated to new code, but others will follow.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
ca9fbec4c2 Use newer phpunit (for withConsecutive) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
431450a237 Make test run even without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Ayrton Fidélis
9d10b94303 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.0% (2928 of 3216 strings)

[CI skip]
 2016-02-03 19:38:39 +01:00
Pedro Moreira
ac61e4b78c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.0% (2928 of 3216 strings)

[CI skip]
 2016-02-03 19:31:50 +01:00
Michal Čihař
db6af1be82 Simplify code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:57:19 +01:00
Michal Čihař
892d09cf74 Add more tests for getting cookie path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:50:00 +01:00
Michal Čihař
ae1ccf3e6a Remove PmaAbsoluteUri configuration directive 
Fixes #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:41:29 +01:00
Michal Čihař
43ca165e9f Remove unused method checkCookiePath 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:34:32 +01:00
Michal Čihař
a569eeca93 Do not use PmaAbsoluteUri for getCookiePath 
Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:32:32 +01:00
Michal Čihař
060aaf9c99 Remove detectHttps method 
The isHttps method does the same and simpler.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:25:58 +01:00
Michal Čihař
a913f99817 Add detection based on REQUEST_URI as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:25:13 +01:00
Michal Čihař
751c958e57 Postpone https check to time when it's needed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:19:59 +01:00
Michal Čihař
49eb80d887 Rewrite tests for https detection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:19:04 +01:00
Michal Čihař
16a30ae87d Fix documented return values 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:15:40 +01:00
Michal Čihař
41c25ca10b Fix number comparing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:15:21 +01:00
Michal Čihař
218ece6dc0 Make isHttps independent of PmaAbsoluteUri 
Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:07:04 +01:00
Michal Čihař
8f17813535 Visualization now works even on HTTPS 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:18:49 +01:00
Michal Čihař
73e01ba665 Use HTTPS when accessing openstreetmap tile server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:17:26 +01:00
Michal Čihař
6238010e7d Use verbatim OpenLayers.js 
... and customize it on init.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:11:24 +01:00
Michal Čihař
41ab867fb7 Use builtin OpenLayers OSM setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 15:07:47 +01:00
Michal Čihař
86daa8f474 Update OpenLayers to 2.13.1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:57:50 +01:00
Michal Čihař
6e78a2c66f Remove OpenStretMap.js from OpenLayers.js, we ship it separately 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:43:02 +01:00
Michal Čihař
c01e32b3c5 Remove PmaAbsoluteUri from javascript params, not used there 
Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:33:42 +01:00
Michal Čihař
4866f8a9e6 Remove support for Mozilla Prism 
This is dead project not supported upstream for years.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
2a9fb73f92 Remove PmaAbsoluteUri from redirects 
This is no longer needed as per RFC 7231.

Issue #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:32:14 +01:00
Michal Čihař
513e4503ba Forgotten changelog entry for ForceSSL removal 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:23:07 +01:00
Michal Čihař
6da017fcfc Load vendor_config just once at testsuite startup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:21:57 +01:00
Michal Čihař
1e9e14d23b Remove ForceSSL configuration directive 
In most setups we simply do not have enough information to decide
whether user has come through HTTPS or not leading to infinite
redirects.

Anyway this is better to handle at web server side together with setting
HSTS headers.

Issue #11412, #11883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:20:11 +01:00
flash1452
0d8085c070 Fix #11864 Move noSelect mehthod to makegrid.js 
Signed-off-by: Vishal Pandey <vishpandey2014@gmail.com>
 2016-02-03 14:06:51 +01:00
Michal Čihař
dc161e86f5 Merge remote-tracking branch 'origin/STABLE' 2016-02-03 14:03:06 +01:00
Michal Čihař
91d0655c8f Merge branch 'QA_4_5' 2016-02-03 13:58:08 +01:00
Weblate
616f7d5b94 Merge remote-tracking branch 'origin/master' 2016-02-03 13:57:18 +01:00
Παναγιώτης Παπάζογλου
393c5db84b Translated using Weblate (Greek) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-02-03 13:57:15 +01:00
Michal Čihař
cd1d926a57 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:56:58 +01:00
Michal Čihař
c3e057b942 Remove unused parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:56:15 +01:00
Michal Čihař
5883f14664 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 13:50:19 +01:00
Michal Čihař
ac9714cf6a Autoloading for phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-01 21:53:53 +01:00