Commit Graph

317 Commits

Author SHA1 Message Date
Isaac Bennetch
d1360f46ce Merge branch 'QA_4_8'
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-06-21 13:54:08 -04:00
Michal Čihař
7662d02939 Avoid looking for ? when checking for file to be included
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-06-21 13:31:00 +02:00
William Desportes
a87bf74eed
Fix for #14295
Fixes: #14295
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-06-03 14:14:08 +02:00
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
b9c0463d96 Use short array syntax instead of long array syntax
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-30 01:42:21 -03:00
Maurício Meneghini Fauth
af148ad92b Enable strict mode in PHP files
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 04:36:04 -03:00
Saksham Gupta
d701f6f0af Remove font size feature (#13925)
Fix #13919

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2018-04-14 07:21:13 -03:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-25 19:32:13 -03:00
Maurício Meneghini Fauth
38767030ef Remove @ operator from ini_get()
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-01 22:36:35 -03:00
Maurício Meneghini Fauth
cf60373e84 Remove @ operator from extension_loaded()
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-01 22:36:35 -03:00
Juvenv
561c6bf82c Remove inline styles from elements (#13883)
* Remove inline styles from elements in index.php #12262
* Remove inline style from element in CentralColumns #12262

Related to #12262

Signed-off-by: Juvenildo Vaz <juvenildo1511@yahoo.com.br>
2017-12-23 15:24:01 -02:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-29 14:16:31 +01:00
Michal Čihař
263722fef8 Move theme selection to index.php
- It really makes no sense to do this on every request.
- We want to redirect after changing to make sure page is loaded with new theme.
- Use value only from POST request (it used to be set by GET in past as well).

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 15:20:55 +01:00
Michal Čihař
f9c73c7b10 Remove special casing for font size
It is now stored in configuration in same way as any other setting.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 15:16:01 +01:00
Michal Čihař
3cfe9605d5 Use shared code for checking page validity
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 09:41:23 +01:00
Michal Čihař
bed6fb4ebd Avois passing extension to Util::getImage
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 14:24:42 +01:00
Maurício Meneghini Fauth
cc2c4fc36d Replace globals with DI in Charsets class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-09 11:31:42 -02:00
Maurício Meneghini Fauth
653f685b9a Merge pull request #13677 from mauriciofauth/functions
Refactor some function calls to static method calls
2017-09-13 08:09:14 -03:00
Michal Čihař
f76f469289 Avoid using print as method name
This seems to confuse some parsers as print is keyword.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-13 09:05:10 +02:00
Maurício Meneghini Fauth
99642bf6e2 Refactor select_server functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-12 23:12:28 -03:00
Maurício Meneghini Fauth
df6ef79e93 Move PMA_printListItem to PhpMyAdmin\Core class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-12 17:51:58 -03:00
Maurício Meneghini Fauth
a2b08bae7b Refactor check_user_privileges to static methods
Refactor check_user_privileges.lib.php functions to static methods and move logic to check_user_privileges.inc.php.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-11 22:09:05 -03:00
Maurício Meneghini Fauth
81ed2c6c03 Refactor git revision function to static function
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-06 22:01:20 -03:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-22 20:51:27 -03:00
Michal Čihař
8270a1c1e1 Indicate SSL status on main page
- indicate status on main page
- indicate possible configuration issues
- show in red if remote connection is not using SSL
- add overview documentation for server SSL setup

Fixes #12354

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 15:04:59 +02:00
Michal Čihař
0effb3012c Use new API to report version and comment
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-17 14:55:18 +02:00
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-08 10:54:21 -03:00
Maurício Meneghini Fauth
8f943ae1c0 Move classes to PhpMyAdmin namespace
- Move Sanitize to PhpMyAdmin namespace
- Move SavedSearches to PhpMyAdmin namespace
- Move Scripts to PhpMyAdmin namespace
- Move ServerStatusData to PhpMyAdmin namespace
- Move Sql to PhpMyAdmin namespace
- Move StorageEngine to PhpMyAdmin namespace
- Move SubPartition to PhpMyAdmin namespace
- Move SysInfoLinux to PhpMyAdmin namespace
- Move SysInfoSunOS to PhpMyAdmin namespace
- Move SysInfoWINNT to PhpMyAdmin namespace
- Move SysInfo to PhpMyAdmin namespace
- Move SystemDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-07 01:46:08 -03:00
Maurício Meneghini Fauth
119563b7ea Move classes to PhpMyAdmin namespace
- Move OpenDocument to PhpMyAdmin namespace
- Move OutputBuffering to PhpMyAdmin namespace
- Move Partition to PhpMyAdmin namespace
- Move Pdf class to PhpMyAdmin namespace
- Move RecentFavoriteTable to PhpMyAdmin namespace
- Move Response to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 23:44:10 -03:00
Maurício Meneghini Fauth
54a15dbd9c Move classes to PhpMyAdmin namespace
- Move Logging to PhpMyAdmin namespace
- Move Menu to PhpMyAdmin namespace
- Move Message to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 13:30:04 -03:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-28 21:17:18 -03:00
Maurício Meneghini Fauth
e330402b5b Refactor the core functions into static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-03 00:52:22 -03:00
Michal Čihař
69da96b3e1 Show warning if twig cache can not be used
Issue #13225

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 11:08:36 +02:00
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