Merge pull request #7044 from MrPetovan/task/router

[friendica.git] / src / Module / Login.php

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 330988df50cc1b94ec8fb5314b38ae6715ce4e71..b0897f2d76b841166fc5b328f4d17254b6276916 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -6,9 +6,9 @@ namespace Friendica\Module;
 
 use Exception;
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
 use Friendica\Core\Authentication;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -20,9 +20,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use LightOpenID;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * Login module
  *
@@ -34,11 +31,11 @@ class Login extends BaseModule
        {
                $a = self::getApp();
 
-               if (x($_SESSION, 'theme')) {
+               if (!empty($_SESSION['theme'])) {
                        unset($_SESSION['theme']);
                }
 
-               if (x($_SESSION, 'mobile-theme')) {
+               if (!empty($_SESSION['mobile-theme'])) {
                        unset($_SESSION['mobile-theme']);
                }
 
@@ -46,15 +43,15 @@ class Login extends BaseModule
                        $a->internalRedirect();
                }
 
-               return self::form(defaults($_SESSION, 'return_path', null), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+               return self::form(defaults($_SESSION, 'return_path', null), intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
        }
 
        public static function post()
        {
-               $return_path = $_SESSION['return_path'];
+               $return_path = defaults($_SESSION, 'return_path', '');
                session_unset();
                $_SESSION['return_path'] = $return_path;
-               
+
                // OpenId Login
                if (
                        empty($_POST['password'])
@@ -68,7 +65,7 @@ class Login extends BaseModule
                        self::openIdAuthentication($openid_url, !empty($_POST['remember']));
                }
 
-               if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
+               if (!empty($_POST['auth-params']) && $_POST['auth-params'] === 'login') {
                        self::passwordAuthentication(
                                trim($_POST['username']),
                                trim($_POST['password']),
@@ -82,6 +79,7 @@ class Login extends BaseModule
         *
         * @param string $openid_url OpenID URL string
         * @param bool   $remember   Whether to set the session remember flag
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function openIdAuthentication($openid_url, $remember)
        {
@@ -115,6 +113,7 @@ class Login extends BaseModule
         * @param string $username User name
         * @param string $password Clear password
         * @param bool   $remember Whether to set the session remember flag
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function passwordAuthentication($username, $password, $remember)
        {
@@ -134,7 +133,7 @@ class Login extends BaseModule
                 * Addons should never set 'authenticated' except to indicate success - as hooks may be chained
                 * and later addons should not interfere with an earlier one that succeeded.
                 */
-               Addon::callHooks('authenticate', $addon_auth);
+               Hook::callAll('authenticate', $addon_auth);
 
                try {
                        if ($addon_auth['authenticated']) {
@@ -149,7 +148,7 @@ class Login extends BaseModule
                                );
                        }
                } catch (Exception $e) {
-                       Logger::log('authenticate: failed login attempt: ' . Strings::escapeTags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+                       Logger::warning('authenticate: failed login attempt', ['action' => 'login', 'username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
                        info('Login failed. Please check your credentials.' . EOL);
                        $a->internalRedirect();
                }
@@ -163,7 +162,7 @@ class Login extends BaseModule
                $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                Authentication::setAuthenticatedSessionForUser($record, true, true);
 
-               if (x($_SESSION, 'return_path')) {
+               if (!empty($_SESSION['return_path'])) {
                        $return_path = $_SESSION['return_path'];
                        unset($_SESSION['return_path']);
                } else {
@@ -221,15 +220,15 @@ class Login extends BaseModule
                        }
                }
 
-               if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
-                       if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
+               if (!empty($_SESSION['authenticated'])) {
+                       if (!empty($_SESSION['visitor_id']) && empty($_SESSION['uid'])) {
                                $contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
                                if (DBA::isResult($contact)) {
                                        self::getApp()->contact = $contact;
                                }
                        }
 
-                       if (x($_SESSION, 'uid')) {
+                       if (!empty($_SESSION['uid'])) {
                                // already logged in user returning
                                $check = Config::get('system', 'paranoia');
                                // extra paranoia - if the IP changed, log them out
@@ -272,14 +271,15 @@ class Login extends BaseModule
        /**
         * @brief Wrapper for adding a login box.
         *
-        * @param string $return_path The path relative to the base the user should be sent
-        *                                                       back to after login completes
-        * @param bool $register If $register == true provide a registration link.
-        *                                               This will most always depend on the value of config.register_policy.
-        * @param array $hiddens  optional
+        * @param string $return_path  The path relative to the base the user should be sent
+        *                             back to after login completes
+        * @param bool   $register     If $register == true provide a registration link.
+        *                             This will most always depend on the value of config.register_policy.
+        * @param array  $hiddens      optional
         *
         * @return string Returns the complete html for inserting into the page
         *
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @hooks 'login_hook' string $o
         */
        public static function form($return_path = null, $register = false, $hiddens = [])
@@ -343,7 +343,7 @@ class Login extends BaseModule
                        ]
                );
 
-               Addon::callHooks('login_hook', $o);
+               Hook::callAll('login_hook', $o);
 
                return $o;
        }