From cd4c756322f9f1ed5fcfff380dffb32d71b421c8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 10 Apr 2019 13:59:06 +0200 Subject: [PATCH] CS fixes --- .../http_authentication.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index e84cda243..1ec14edff 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -36,12 +36,13 @@ class http_authentication extends rcube_plugin // handle login action if (empty($_SESSION['user_id'])) { - $args['action'] = 'login'; - $this->redirect_query = $_SERVER['QUERY_STRING']; + $args['action'] = 'login'; + $this->redirect_query = $_SERVER['QUERY_STRING']; } // Set user password in session (see shutdown() method for more info) else if (!empty($_SESSION['user_id']) && empty($_SESSION['password']) - && !empty($_SERVER['PHP_AUTH_PW'])) { + && !empty($_SERVER['PHP_AUTH_PW']) + ) { $_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']); } } @@ -55,8 +56,9 @@ class http_authentication extends rcube_plugin $this->load_config(); $host = rcmail::get_instance()->config->get('http_authentication_host'); - if (is_string($host) && trim($host) !== '' && empty($args['host'])) + if (is_string($host) && trim($host) !== '' && empty($args['host'])) { $args['host'] = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host)); + } // Allow entering other user data in login form, // e.g. after log out (#1487953) @@ -66,12 +68,13 @@ class http_authentication extends rcube_plugin if (!empty($_SERVER['PHP_AUTH_USER'])) { $args['user'] = $_SERVER['PHP_AUTH_USER']; - if (!empty($_SERVER['PHP_AUTH_PW'])) + if (!empty($_SERVER['PHP_AUTH_PW'])) { $args['pass'] = $_SERVER['PHP_AUTH_PW']; + } } $args['cookiecheck'] = false; - $args['valid'] = true; + $args['valid'] = true; return $args; } @@ -96,10 +99,11 @@ class http_authentication extends rcube_plugin function login($args) { // Redirect to the previous QUERY_STRING - if($this->redirect_query){ + if ($this->redirect_query) { header('Location: ./?' . $this->redirect_query); exit; } + return $args; } }