Commit Graph

284 Commits

Author SHA1 Message Date
Michal Čihař
8d6b1dce57 Improved handling of logout with disabled LoginCookieDeleteAll
- avoid removing session for cookie auth if LoginCookieDeleteAll is
  disabled
- redirect user to other server rather than to login page
- show message about partial logout
- adjust tests
- this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-28 16:02:11 +02:00
Michal Čihař
8cc6de4de3 Remove ServerLibraryDifference_DisableWarning setting
This is getting more and more problematic these days as most of Linux
distributions ship MariaDB libraries, while many people run MySQL
servers. As MariaDB claims the protocol compatibility should stay, we
should not warn in this case.

Of course there is option to add this exception to the warning (so far
the exception is there only other way - when using MySQL libraries to
connect to MariaDB server), but we would be ignoring most cases already
and I think complete removal is better than adding exceptions.

Overall I don't think this warning is doing any good these days.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-20 09:19:22 +01:00
Michal Čihař
924aabf652 Do not show language selector without choices
Move the check from template to the code, so that the selection is
completely hidden when there is nothing to select.

Fixes #12988

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-13 11:22:43 +01:00
Michal Čihař
5c3f74d875 Merge branch 'QA_4_6' 2017-01-17 17:22:53 +01:00
Michal Čihař
93e354c2e3 Revert "Remove option to show phpinfo() ($cfg['ShowPhpInfo'])"
This reverts commit e67e69229a.
2017-01-07 14:22:14 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 18:17:59 +01:00
Michal Čihař
b56f101039 Remove is_ajax_request global
We already have the same information on Response object, so let's use it
from there.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 17:54:34 +01:00
Michal Čihař
daae30499f Merge branch 'master' into master-security 2016-11-08 15:59:39 +01:00
Deven Bansod
e2dac31bdb Refactor the language selector display into a template
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-10-31 09:02:59 +05:30
Michal Čihař
2ed64c3c6a Merge branch 'master' into master-security 2016-10-24 13:55:39 +02:00
Michal Čihař
47078395c2 Merge branch 'QA_4_6' into QA_4_6-security 2016-10-24 13:55:29 +02:00
Michal Čihař
75a5fde46d Use secure.php.net for PHP documentation links
This avoids unnecessary redirect on the way (I still think this website
setup is weird, but that's all I can do about it).

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-18 11:13:24 +02:00
Michal Čihař
4311ea09d9 Merge branch 'QA_4_6' 2016-10-17 17:03:12 +02:00
Michal Čihař
4055eb9162 Refuse to work with mbstring.func_overload enabled
In several places our code assumes that strlen does return length in
bytes and not in chars. This can be different with
mbstring.func_overload and will lead to several hard to debug breakages.
Therefore it's safer to simply deny using phpMyAdmin with this setting.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-04 13:06:01 +02:00
Michal Čihař
5ee95b3615 Merge branch 'QA_4_6-security' into master-security 2016-09-02 15:04:55 +02:00
Michal Čihař
dac36c3cd8 Stricter URL validation
- do not use empty() as empty('0') is true
- do not lowercase the strings, use them as they are
- lowercase all domains in our codebase
- do not allow to specify port

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-02 15:00:43 +02:00
Michal Čihař
8d46edc4b6 Merge branch 'QA_4_6' 2016-08-24 12:03:37 +02:00
Michal Čihař
6879923acc Do not show warning about short blowfish_secret if none is set
With empty blowfish_secret user would always get both warnings...

Fixes #12485

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-24 12:03:22 +02:00
Michal Čihař
46b329c32b Merge branch 'QA_4_6' 2016-08-18 17:37:34 +02:00
Michal Čihař
6faa1fe46a Add rel="noopener noreferrer" to all external target="_blank" links
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-18 17:35:20 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Isaac Bennetch
0f6b76b578 Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6 2016-08-16 16:34:37 -04:00
Michal Čihař
88b817a042 Merge branch 'QA_4_6' 2016-08-03 10:27:54 +02:00
Michal Čihař
91ff2a97e2 Open demo information in new tab
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 10:27:49 +02:00
Michal Čihař
12873604cb Merge branch 'master' into master-security 2016-08-02 09:16:12 +02:00
Michal Čihař
e7d4ef2fbc Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 09:16:03 +02:00
Michal Čihař
21a9bbea9f Merge branch 'QA_4_6' 2016-08-02 08:57:17 +02:00
Pavel Rochnyack
37c2886845 Improved indents, alignment and rtl in Original theme
* Fixed list items aligment in rtl view
* Fixed notices icon alignment in rtl and ltr views
* Fixed Footer.php getErrorMessages() to avoid <div id="pma_errors"><div id="pma_errors">....</div></div> nested blocks.
* Removed indentation by &nbsp;

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
2016-08-01 03:08:48 +01:00
Michal Čihař
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Michal Čihař
e67e69229a Remove option to show phpinfo() ($cfg['ShowPhpInfo'])
This is really more a PHP debugging feature than anything related to
phpMyAdmin. If user wants to debug, it's as simple a creating file with
one line of php code.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-23 11:31:46 +02:00
Michal Čihař
2adf1ca83e Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:35:14 +02:00
Michal Čihař
f07fd90ee9 Document recommended length of 32 for blowfish_secret
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-22 10:14:02 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-16 13:41:35 +02:00
Isaac Bennetch
e6db8e18ee Fix some CodeSniffer warnings and errors
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-06-12 23:12:23 -04:00
Michal Čihař
95f2d15b4f Merge branch 'QA_4_6' 2016-05-17 10:12:04 +02:00
Michal Čihař
3771852471 Use https when linking to php.net
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:10:13 +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
Michal Čihař
5231649343 Merge commit 'cda4290749f10ed686bfb466b415e5e3a1c04fea' 2016-05-09 20:09:36 +02:00
Michal Čihař
b2f77691e9 Use https links where applicable
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-29 15:41:33 +02:00
Michal Čihař
bdb20d1499 Remove link to wiki
It's outdated and will be soon completely disabled.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-29 15:37:32 +02:00
Michal Čihař
59e56bd63a Pass link to demo server through url.php
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-29 15:36:54 +02:00
Michal Čihař
b311780d76 Separate methods for charset and collation dropdowns
They do not share much code in the end and this way the code is more
readable.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 13:04:41 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:55:42 +02:00
Michal Čihař
cfc2f1cb05 Move charsets obtaining to the Charsets class
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 10:49:09 +02:00
Michal Čihař
cd4008b3d7 Move MySQL charset maps to separate class
This allows us to load it only when needed

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 10:33:40 +02:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Michal Čihař
5042b65398 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:45:43 +01:00
Michal Čihař
4534a90b80 Silent warnings when checking for file existance
Another occurences of file_exists which can be limited by open_basedir.

Issue #11940

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-12 10:38:47 +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