Merge pull request #7435 from annando/select-to-array

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

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 7a3b6ae45775c82e0be800ece1937ceaf953822c..966ded57faa3b94ffd6b086eb63f165914b7eb16 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -32,26 +32,21 @@ class Login extends BaseModule
        {
                $a = self::getApp();
 
-               if (!empty($_SESSION['theme'])) {
-                       unset($_SESSION['theme']);
-               }
-
-               if (!empty($_SESSION['mobile-theme'])) {
-                       unset($_SESSION['mobile-theme']);
-               }
+               Session::remove('theme');
+               Session::remove('mobile-theme');
 
                if (local_user()) {
                        $a->internalRedirect();
                }
 
-               return self::form(defaults($_SESSION, 'return_path', null), intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
+               return self::form(Session::get('return_path'), intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
        }
 
        public static function post()
        {
-               $return_path = defaults($_SESSION, 'return_path', '');
+               $return_path = Session::get('return_path');
                session_unset();
-               $_SESSION['return_path'] = $return_path;
+               Session::set('return_path', $return_path);
 
                // OpenId Login
                if (
@@ -159,17 +154,13 @@ class Login extends BaseModule
                }
 
                // if we haven't failed up this point, log them in.
-               $_SESSION['remember'] = $remember;
-               $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
+               Session::set('remember', $remember);
+               Session::set('last_login_date', DateTimeFormat::utcNow());
 
                Session::setAuthenticatedForUser($a, $record, true, true);
 
-               if (!empty($_SESSION['return_path'])) {
-                       $return_path = $_SESSION['return_path'];
-                       unset($_SESSION['return_path']);
-               } else {
-                       $return_path = '';
-               }
+               $return_path = Session::get('return_path', '');
+               Session::remove('return_path');
 
                $a->internalRedirect($return_path);
        }
@@ -290,7 +281,7 @@ class Login extends BaseModule
                $a = self::getApp();
                $o = '';
                $reg = false;
-               if ($register) {
+               if ($register && intval($a->getConfig()->get('config', 'register_policy')) !== Register::CLOSED) {
                        $reg = [
                                'title' => L10n::t('Create a New Account'),
                                'desc' => L10n::t('Register')