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

51 Commits

Author SHA1 Message Date
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
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ř
0816b47b3d Document cookie exipiry times 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 16:40:51 +02:00
Michal Čihař
fba1469969 Merge pull request #12250 from nijel/thememanager-singleton 
Make ThemeManager a singleton instead of storing it in the session
 2016-05-16 17:27:26 +02:00
Michal Čihař
0432a8af70 Merge branch 'QA_4_6' 2016-05-12 14:01:26 +02:00
Michal Čihař
8396ee4a3a Fix cookie path on IIS 
The path can contain backslashes on Windows, so let's replace them
before using it as cookie path which needs just forward slashes.

Fixes #12249

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-12 14:00:42 +02:00
Michal Čihař
ca5eb903b0 Make ThemeManager a singleton instead of storing it in the session 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 15:34:25 +02:00
Isaac Bennetch
cda4290749 Prepare for 4.6.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-02 21:53:57 -04:00
Isaac Bennetch
07fd0bce67 4.6.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-02 17:13:27 -04:00
Michal Čihař
22360b2a3b Merge branch 'QA_4_6' 2016-04-20 09:23:47 +02:00
Michal Čihař
999db1491c Fixed setting of language from user configuration 
Fixes #12202

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 09:13:17 +02:00
Michal Čihař
9182a4d3a1 Move error checking to the Config class 
Also fix not working checking error on the defaults.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 16:17:02 +02:00
Isaac Bennetch
c9dd2e8a78 Prepare for 4.6.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-17 07:41:26 -04:00
Isaac Bennetch
37b38431d1 4.6.0 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-17 05:47:44 -04:00
Isaac Bennetch
0fc00c0ab8 4.6.0-rc2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:32:07 -05:00
Michal Čihař
2c256da5e8 Merge commit '73fd0dc2a8f5471c717a887aae22bde97bc5498f' 2016-03-01 07:45:58 +01:00
Isaac Bennetch
73fd0dc2a8 4.6.0-rc1 pre-release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:56:32 -05:00
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Madhura Jayaratne
eb7b999293 Merge branch 'QA_4_6' 2016-02-16 15:28:13 +11:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +01:00
Michal Čihař
5042b65398 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:45:43 +01:00
Isaac Bennetch
d96dc09e99 Correction for 4.6.0-alpha1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-10 11:13:13 -05:00
Isaac Bennetch
74ae9ab6d1 4.6.0-alpha release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-10 10:51:15 -05:00
Michal Čihař
a6b4735aee Merge branch 'QA_4_6' 2016-02-09 11:01:40 +01:00
Michal Čihař
3ebacb0025 Simplify loading of vendor configuration 
Do it just once and very early, so that all scripts can rely on it being
available.

Fixes autoloading of phpseclib.

Fixes #11914

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 11:00:54 +01:00
Michal Čihař
2a01a5520d Merge branch 'QA_4_6' 2016-02-08 09:56:36 +01:00
Michal Čihař
de7181653f Correctly handle paths to exact files when setting cookie 
We need to set path to folder not a given file.

Fixes #11916

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:54:57 +01:00
Michal Čihař
475f936366 Setting version to 4.7.0-dev 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:42:29 +01:00
Michal Čihař
10e11fe67d Replace define by using Config class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:36:27 +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ř
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ř
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
Michal Čihař
e95bb0e361 Remove own code for generating numeric PHP version 
Since PHP 5.2.7 there is PHP_VERSION_ID for it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 14:53:58 +01:00
Michal Čihař
e0b1c1643e Close should not fail if open didn't 
Hiding error on close is not needed, this should not happen unless the
system is really in a bad shape.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:05:01 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Binyamin Laukstein
72cbfd920e CloudFlare's Flexible SSL support 
Resource https://www.cloudflare.com/ssl/

Signed-off-by: Binyamin Laukstein <7raivis@inbox.lv>
 2015-12-30 10:04:50 -05:00
Michal Čihař
3565e4db79 Remove PMA_arrayMergeRecursive 
It can be replaced with array_replace_recursive as of PHP 5.3, we
require PHP 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:06:00 +01:00
Madhura Jayaratne
f26e0f8ad6 Merge branch 'QA_4_5' 2015-11-03 17:02:17 +11:00
Hugues Peccatte
0d62b5eb72 Remove nested levels in code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 14:50:57 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Hugues Peccatte
58b10807c8 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:22 +02:00