Commit Graph

57 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
ac9bccf67d Replace $GLOBALS['dbi'] with global $dbi
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-11 09:24:21 -03:00
Maurício Meneghini Fauth
bb32ba6d9c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-10-04 12:31:43 -03:00
Maurício Meneghini Fauth
3f01cd8c13 Remove Message::display method
Related to https://github.com/phpmyadmin/phpmyadmin/issues/16258.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-20 19:43:46 -03:00
Maurício Meneghini Fauth
3b285ff17e Use identical operator for non-empty strings
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-10 18:06:29 -03:00
Maurício Meneghini Fauth
e81146e4b3 Remove useless return annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-07-07 10:30:27 -03:00
Maurício Meneghini Fauth
f4582e083e Use early exit when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-27 00:35:24 -03:00
Maurício Meneghini Fauth
bd979dd1ff Remove useless elseif with if
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 22:53:44 -03:00
Maurício Meneghini Fauth
82c2964bb8 Remove useless elses
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-26 22:27:45 -03:00
Maurício Meneghini Fauth
3baad2eb1c Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 22:42:37 -03:00
Maurício Meneghini Fauth
9269d75fb4 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-25 20:22:18 -03:00
Maurício Meneghini Fauth
a64393e7f5 Fix some coding standard issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-05-13 00:23:28 -03:00
William Desportes
69cb73e6d7
Merge #15872 - Fix #14149 - Improve expired session message
Merge #15872
Fixes: #14149
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-02 13:17:17 +02:00
William Desportes
b7af1364c6
Psalm auto fixes manualy reviewed and edited
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-28 23:18:59 +02:00
Yash Bothra
e521a20f07 #14149 added continue seesion msg
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
2020-02-01 16:00:27 +05:30
Maurício Meneghini Fauth
6584b01824 Use short versions of scalar types in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-23 12:20:04 -03:00
Maurício Meneghini Fauth
676f48349a Reference global funcs and consts via use statement
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 22:13:36 -03:00
Maurício Meneghini Fauth
5e0f539d2f Fix invalid @var php doc annotations
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-21 13:19:08 -03:00
Maurício Meneghini Fauth
f80d3e3bd4 Remove unnecessary annotations
@package, @subpackage and others.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 17:35:56 -03:00
Maurício Meneghini Fauth
6283caaabf Use one line for comments with a single line
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 16:04:09 -03:00
Maurício Meneghini Fauth
c231652c67 Remove useless comments in PHP docs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-01-20 14:38:49 -03:00
Maurício Meneghini Fauth
77518d341e Remove unused use statements
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-11 21:20:58 -03:00
Maurício Meneghini Fauth
351e34ecf5 Upgrade PHPStan to version 0.12.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-12-07 20:26:39 -03:00
William Desportes
519aeadbc8
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-03 15:58:13 +01:00
William Desportes
c7f7f9c6c0
Merge branch 'QA_4_9' into QA_5_0
Revert: 45d46a6316

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-11-03 15:52:51 +01:00
William Desportes
a3d77ce84b
Fix #14184 - HTTPS/HTTP cookie separation issue (aka Failed to set session cookie. Maybe you are using HTTP instead of HTTPS)
Duplicate-of-pull-request: #14420
Fixes: #14184
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-30 00:06:12 +01:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Maurício Meneghini Fauth
dd95a34b3a Add route parameter to index.php links
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-26 17:37:53 -03:00
Maurício Meneghini Fauth
afe8839519 Remove __get method from TwoFactor class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-02 00:36:06 -03:00
Hugues Peccatte
0d8f6a3a93 Merge isset and unset calls
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-07-16 23:21:25 -03:00
William Desportes
6cc352ac12
phpstan level 3 fixes
21 errors left

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-06-22 14:37:38 +02:00
Maurício Meneghini Fauth
7be0f6bfae Reference class names in use statements
Sort use statements

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-12 00:14:26 -03:00
Hugues Peccatte
9406e922cc Update PHPDoc
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-13 09:52:46 +01:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:56:34 -02:00
Maurício Meneghini Fauth
244d4e8e81 Replace Template::get calls in libraries/classes
Uses Template::render() instead of Template::get().

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-18 18:18:24 -03: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
0998a50e9e Enable strict mode in Plugins classes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
d15dbea63c Refactor PhpMyAdmin\IpAllowDeny::allowDeny() method
Simplifies the method by separating it into two new methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-03 14:28:37 -03:00
Maurício Meneghini Fauth
d23ed47666 Refactor PhpMyAdmin\IpAllowDeny static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-03 14:06:13 -03:00
Gabriel Caruso
a8bd364e02 Clean elses
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2017-12-14 22:02:17 -02:00
Maurício Meneghini Fauth
c930c7a030 Fix coding standard errors
Automatic fixes by phpcbf.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-12-04 13:40:36 -02:00
Michal Čihař
8f27080d72 Fix php5 compatibility
Issue #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 07:53:22 +01:00
Michal Čihař
b8fb7f254b Fix referenceding twofactor attribute
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 22:24:06 +01:00
Michal Čihař
c7e0782201 Do not show verify button on invalid 2fa
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 16:17:12 +01:00
Michal Čihař
49a1b0e743 Move session cleanup to post login
It was really misplaced in 951e8ac753
it did cleanup session with every request.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 13:14:58 +01:00
Michal Čihař
80db5c457a Merge branch 'QA_4_7' 2017-11-27 09:26:41 +01:00
Michal Čihař
951e8ac753 Consistent session handling across plugins
We want all auth plugins to behave same, there is no reason to secure
session only in the cookie plugin.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 09:14:52 +01:00
Michal Čihař
5acd64f84d Use two-factor authentication instead fo second authentication factor
This is probably more widely used naming.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-02 09:05:18 +01:00
Michal Čihař
a646d4314e Add generic interface for second authentication factor
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-01 16:34:14 +01:00
Michal Čihař
8e8f4bd3bb Avoid using PHP_AUTH_USER and PHP_AUTH_PW globals for auth
Use object attributes to store the actual credentials and avoid
messing up with global variables.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-20 19:44:28 +02:00