From f8f163d054110f7e0ff6650fca146b474335f4bd Mon Sep 17 00:00:00 2001 From: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> Date: Fri, 7 Jul 2023 22:36:27 +0200 Subject: Chore/processing of depreciations and updating code to php72 minimum (#5504) * processing of depreciations and updating of code to php7.2 minimum * Autoformat many strange array indenting And revert a few unwanted changes --------- Co-authored-by: Luc Co-authored-by: Alexandre Alapetite --- app/Controllers/userController.php | 44 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'app/Controllers/userController.php') diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 90eb44800..aa5682e26 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -8,7 +8,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { * The username is also used as folder name, file name, and part of SQL table name. * '_' is a reserved internal username. */ - const USERNAME_PATTERN = '([0-9a-zA-Z_][0-9a-zA-Z_.@-]{1,38}|[0-9a-zA-Z])'; + public const USERNAME_PATTERN = '([0-9a-zA-Z_][0-9a-zA-Z_.@-]{1,38}|[0-9a-zA-Z])'; public static function checkUsername(string $username): bool { return preg_match('/^' . self::USERNAME_PATTERN . '$/', $username) === 1; @@ -69,12 +69,12 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($ok) { $isSelfUpdate = Minz_User::name() === $username; if ($passwordPlain == '' || !$isSelfUpdate) { - Minz_Request::good(_t('feedback.user.updated', $username), array('c' => 'user', 'a' => 'manage')); + Minz_Request::good(_t('feedback.user.updated', $username), ['c' => 'user', 'a' => 'manage']); } else { - Minz_Request::good(_t('feedback.profile.updated'), array('c' => 'index', 'a' => 'index')); + Minz_Request::good(_t('feedback.profile.updated'), ['c' => 'index', 'a' => 'index']); } } else { - Minz_Request::bad(_t('feedback.user.updated.error', $username), [ 'c' => 'user', 'a' => 'manage' ]); + Minz_Request::bad(_t('feedback.user.updated.error', $username), ['c' => 'user', 'a' => 'manage']); } } } @@ -111,14 +111,14 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($system_conf->force_email_validation && empty($email)) { Minz_Request::bad( _t('user.email.feedback.required'), - array('c' => 'user', 'a' => 'profile') + ['c' => 'user', 'a' => 'profile'] ); } if (!empty($email) && !validateEmailAddress($email)) { Minz_Request::bad( _t('user.email.feedback.invalid'), - array('c' => 'user', 'a' => 'profile') + ['c' => 'user', 'a' => 'profile'] ); } @@ -135,14 +135,14 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($ok) { if ($system_conf->force_email_validation && $email !== $old_email) { - Minz_Request::good(_t('feedback.profile.updated'), array('c' => 'user', 'a' => 'validateEmail')); + Minz_Request::good(_t('feedback.profile.updated'), ['c' => 'user', 'a' => 'validateEmail']); } elseif ($passwordPlain == '') { - Minz_Request::good(_t('feedback.profile.updated'), array('c' => 'user', 'a' => 'profile')); + Minz_Request::good(_t('feedback.profile.updated'), ['c' => 'user', 'a' => 'profile']); } else { - Minz_Request::good(_t('feedback.profile.updated'), array('c' => 'index', 'a' => 'index')); + Minz_Request::good(_t('feedback.profile.updated'), ['c' => 'index', 'a' => 'index']); } } else { - Minz_Request::bad(_t('feedback.profile.error'), [ 'c' => 'user', 'a' => 'profile' ]); + Minz_Request::bad(_t('feedback.profile.error'), ['c' => 'user', 'a' => 'profile']); } } } @@ -441,7 +441,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($user_config->email_validation_token === '') { Minz_Request::good( _t('user.email.validation.feedback.unnecessary'), - array('c' => 'index', 'a' => 'index') + ['c' => 'index', 'a' => 'index'] ); } @@ -449,7 +449,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($user_config->email_validation_token !== $token) { Minz_Request::bad( _t('user.email.validation.feedback.wrong_token'), - array('c' => 'user', 'a' => 'validateEmail') + ['c' => 'user', 'a' => 'validateEmail'] ); } @@ -457,12 +457,12 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if ($user_config->save()) { Minz_Request::good( _t('user.email.validation.feedback.ok'), - array('c' => 'index', 'a' => 'index') + ['c' => 'index', 'a' => 'index'] ); } else { Minz_Request::bad( _t('user.email.validation.feedback.error'), - array('c' => 'user', 'a' => 'validateEmail') + ['c' => 'user', 'a' => 'validateEmail'] ); } } @@ -491,16 +491,16 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { $user_config = FreshRSS_Context::$user_conf; if ($user_config->email_validation_token === '') { - Minz_Request::forward(array( + Minz_Request::forward([ 'c' => 'index', 'a' => 'index', - ), true); + ], true); } $mailer = new FreshRSS_User_Mailer(); $ok = $mailer->send_email_need_validation($username, $user_config); - $redirect_url = array('c' => 'user', 'a' => 'validateEmail'); + $redirect_url = ['c' => 'user', 'a' => 'validateEmail']; if ($ok) { Minz_Request::good( _t('user.email.validation.feedback.email_sent'), @@ -549,7 +549,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { } if ($ok && $self_deletion) { FreshRSS_Auth::removeAccess(); - $redirect_url = array('c' => 'index', 'a' => 'index'); + $redirect_url = ['c' => 'index', 'a' => 'index']; } invalidateHttpCache(); @@ -603,10 +603,12 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { FreshRSS_UserDAO::touch($username); if ($ok) { - Minz_Request::good(_t('feedback.user.updated', $username), array('c' => 'user', 'a' => 'manage')); + Minz_Request::good(_t('feedback.user.updated', $username), ['c' => 'user', 'a' => 'manage']); } else { - Minz_Request::bad(_t('feedback.user.updated.error', $username), - array('c' => 'user', 'a' => 'manage')); + Minz_Request::bad( + _t('feedback.user.updated.error', $username), + ['c' => 'user', 'a' => 'manage'] + ); } } -- cgit v1.2.3