X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=df918c44c8ed0aee91af7e6e2b774486f4e287f8;hb=2a881cc2e71b1677cc9ce98001ae3f157743e542;hp=deb6afcfbc03e0dae8624f88ffe53a4918e03fb4;hpb=f10481796778811d3ea4fab803508be3ffde84e4;p=friendica.git

diff --git a/src/Module/Login.php b/src/Module/Login.php
index deb6afcfbc..df918c44c8 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -10,6 +10,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
@@ -39,17 +40,17 @@ class Login extends BaseModule
 		}
 
 		if (local_user()) {
-			goaway(self::getApp()->getBaseURL());
+			$a->internalRedirect();
 		}
 
-		return self::form($_SESSION['return_url'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+		return self::form($_SESSION['return_path'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
 	}
 
 	public static function post()
 	{
-		$return_url = $_SESSION['return_url'];
+		$return_path = $_SESSION['return_path'];
 		session_unset();
-		$_SESSION['return_url'] = $return_url;
+		$_SESSION['return_path'] = $return_path;
 		
 		// OpenId Login
 		if (
@@ -83,22 +84,23 @@ class Login extends BaseModule
 	{
 		$noid = Config::get('system', 'no_openid');
 
+		$a = self::getApp();
+
 		// 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()->getBaseURL());
+			$a->internalRedirect();
 			// NOTREACHED
 		}
 
 		// Otherwise it's probably an openid.
 		try {
-			$a = get_app();
 			$openid = new LightOpenID($a->getHostName());
 			$openid->identity = $openid_url;
 			$_SESSION['openid'] = $openid_url;
 			$_SESSION['remember'] = $remember;
-			$openid->returnUrl = self::getApp()->getBaseURL(true) . '/openid';
-			goaway($openid->authUrl());
+			$openid->returnUrl = $a->getBaseURL(true) . '/openid';
+			System::externalRedirect($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());
 		}
@@ -122,6 +124,8 @@ class Login extends BaseModule
 			'user_record' => null
 		];
 
+		$a = self::getApp();
+
 		/*
 		 * An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record
 		 * Addons should never set 'authenticated' except to indicate success - as hooks may be chained
@@ -144,7 +148,7 @@ class Login extends BaseModule
 		} catch (Exception $e) {
 			logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
 			info('Login failed. Please check your credentials.' . EOL);
-			goaway('/');
+			$a->internalRedirect();
 		}
 
 		if (!$remember) {
@@ -156,14 +160,14 @@ class Login extends BaseModule
 		$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
 		Authentication::setAuthenticatedSessionForUser($record, true, true);
 
-		if (x($_SESSION, 'return_url')) {
-			$return_url = $_SESSION['return_url'];
-			unset($_SESSION['return_url']);
+		if (x($_SESSION, 'return_path')) {
+			$return_path = $_SESSION['return_path'];
+			unset($_SESSION['return_path']);
 		} else {
-			$return_url = '';
+			$return_path = '';
 		}
 
-		goaway($return_url);
+		$a->internalRedirect($return_path);
 	}
 
 	/**
@@ -173,6 +177,8 @@ class Login extends BaseModule
 	 */
 	public static function sessionAuth()
 	{
+		$a = self::getApp();
+
 		// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
 		if (isset($_COOKIE["Friendica"])) {
 			$data = json_decode($_COOKIE["Friendica"]);
@@ -191,7 +197,7 @@ class Login extends BaseModule
 					if ($data->hash != Authentication::getCookieHashForUser($user)) {
 						logger("Hash for user " . $data->uid . " doesn't fit.");
 						Authentication::deleteSession();
-						goaway(self::getApp()->getBaseURL());
+						$a->internalRedirect();
 					}
 
 					// Renew the cookie
@@ -228,7 +234,7 @@ class Login extends BaseModule
 					logger('Session address changed. Paranoid setting in effect, blocking session. ' .
 						$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
 					Authentication::deleteSession();
-					goaway(self::getApp()->getBaseURL());
+					$a->internalRedirect();
 				}
 
 				$user = DBA::selectFirst('user', [],
@@ -242,7 +248,7 @@ class Login extends BaseModule
 				);
 				if (!DBA::isResult($user)) {
 					Authentication::deleteSession();
-					goaway(self::getApp()->getBaseURL());
+					$a->internalRedirect();
 				}
 
 				// Make sure to refresh the last login time for the user if the user
@@ -263,7 +269,7 @@ class Login extends BaseModule
 	/**
 	 * @brief Wrapper for adding a login box.
 	 *
-	 * @param string $return_url The url relative to the base the user should be sent
+	 * @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.
@@ -273,7 +279,7 @@ class Login extends BaseModule
 	 *
 	 * @hooks 'login_hook' string $o
 	 */
-	public static function form($return_url = null, $register = false, $hiddens = [])
+	public static function form($return_path = null, $register = false, $hiddens = [])
 	{
 		$a = self::getApp();
 		$o = '';
@@ -287,8 +293,8 @@ class Login extends BaseModule
 
 		$noid = Config::get('system', 'no_openid');
 
-		if (is_null($return_url)) {
-			$return_url = $a->query_string;
+		if (is_null($return_path)) {
+			$return_path = $a->query_string;
 		}
 
 		if (local_user()) {
@@ -302,7 +308,7 @@ class Login extends BaseModule
 			);
 
 			$tpl = get_markup_template('login.tpl');
-			$_SESSION['return_url'] = $return_url;
+			$_SESSION['return_path'] = $return_path;
 		}
 
 		$o .= replace_macros(