Merge pull request #5862 from nupplaphil/rename_App_Methods

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

diff --git a/src/Module/Login.php b/src/Module/Login.php
index ad5d5ad0b6acbc66d5e6d9eb6a2294a54d3010b4..15505a38be61295c8118d9b449a4da51b2daed7b 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -39,15 +39,18 @@ class Login extends BaseModule
                }
 
                if (local_user()) {
-                       goaway(self::getApp()->get_baseurl());
+                       goaway(self::getApp()->getBaseURL());
                }
 
-               return self::form(self::getApp()->get_baseurl(), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+               return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
        }
 
        public static function post()
        {
+               $return_url = $_SESSION['return_url'];
                session_unset();
+               $_SESSION['return_url'] = $return_url;
+               
                // OpenId Login
                if (
                        empty($_POST['password'])
@@ -83,18 +86,18 @@ class Login extends BaseModule
                // if it's an email address or doesn't resolve to a URL, fail.
                if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
                        notice(L10n::t('Login failed.') . EOL);
-                       goaway(self::getApp()->get_baseurl());
+                       goaway(self::getApp()->getBaseURL());
                        // NOTREACHED
                }
 
                // Otherwise it's probably an openid.
                try {
                        $a = get_app();
-                       $openid = new LightOpenID($a->get_hostname());
+                       $openid = new LightOpenID($a->getHostName());
                        $openid->identity = $openid_url;
                        $_SESSION['openid'] = $openid_url;
                        $_SESSION['remember'] = $remember;
-                       $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid';
+                       $openid->returnUrl = self::getApp()->getBaseURL(true) . '/openid';
                        goaway($openid->authUrl());
                } catch (Exception $e) {
                        notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . L10n::t('The error message was:') . ' ' . $e->getMessage());
@@ -188,7 +191,7 @@ class Login extends BaseModule
                                        if ($data->hash != cookie_hash($user)) {
                                                logger("Hash for user " . $data->uid . " doesn't fit.");
                                                nuke_session();
-                                               goaway(self::getApp()->get_baseurl());
+                                               goaway(self::getApp()->getBaseURL());
                                        }
 
                                        // Renew the cookie
@@ -225,7 +228,7 @@ class Login extends BaseModule
                                        logger('Session address changed. Paranoid setting in effect, blocking session. ' .
                                                $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
                                        nuke_session();
-                                       goaway(self::getApp()->get_baseurl());
+                                       goaway(self::getApp()->getBaseURL());
                                }
 
                                $user = DBA::selectFirst('user', [],
@@ -239,7 +242,7 @@ class Login extends BaseModule
                                );
                                if (!DBA::isResult($user)) {
                                        nuke_session();
-                                       goaway(self::getApp()->get_baseurl());
+                                       goaway(self::getApp()->getBaseURL());
                                }
 
                                // Make sure to refresh the last login time for the user if the user
@@ -294,7 +297,7 @@ class Login extends BaseModule
                        $a->page['htmlhead'] .= replace_macros(
                                get_markup_template('login_head.tpl'),
                                [
-                                       '$baseurl' => $a->get_baseurl(true)
+                                       '$baseurl' => $a->getBaseURL(true)
                                ]
                        );
 
@@ -305,7 +308,7 @@ class Login extends BaseModule
                $o .= replace_macros(
                        $tpl,
                        [
-                               '$dest_url'     => self::getApp()->get_baseurl(true) . '/login',
+                               '$dest_url'     => self::getApp()->getBaseURL(true) . '/login',
                                '$logout'       => L10n::t('Logout'),
                                '$login'        => L10n::t('Login'),