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

diff --git a/src/Module/Login.php b/src/Module/Login.php
index df918c44c8..41ea917cf3 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -10,16 +10,16 @@ use Friendica\Core\Addon;
 use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use LightOpenID;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * Login module
  *
@@ -31,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']);
 		}
 
@@ -43,15 +43,15 @@ class Login extends BaseModule
 			$a->internalRedirect();
 		}
 
-		return self::form($_SESSION['return_path'], intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
+		return self::form(defaults($_SESSION, 'return_path', null), intval(Config::get('config', 'register_policy')) !== 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'])
@@ -65,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']),
@@ -146,7 +146,7 @@ class Login extends BaseModule
 				);
 			}
 		} catch (Exception $e) {
-			logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+			Logger::log('authenticate: failed login attempt: ' . Strings::escapeTags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
 			info('Login failed. Please check your credentials.' . EOL);
 			$a->internalRedirect();
 		}
@@ -160,7 +160,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 {
@@ -195,7 +195,7 @@ class Login extends BaseModule
 				);
 				if (DBA::isResult($user)) {
 					if ($data->hash != Authentication::getCookieHashForUser($user)) {
-						logger("Hash for user " . $data->uid . " doesn't fit.");
+						Logger::log("Hash for user " . $data->uid . " doesn't fit.");
 						Authentication::deleteSession();
 						$a->internalRedirect();
 					}
@@ -218,20 +218,20 @@ 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
 				if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
-					logger('Session address changed. Paranoid setting in effect, blocking session. ' .
+					Logger::log('Session address changed. Paranoid setting in effect, blocking session. ' .
 						$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
 					Authentication::deleteSession();
 					$a->internalRedirect();
@@ -298,20 +298,20 @@ class Login extends BaseModule
 		}
 
 		if (local_user()) {
-			$tpl = get_markup_template('logout.tpl');
+			$tpl = Renderer::getMarkupTemplate('logout.tpl');
 		} else {
-			$a->page['htmlhead'] .= replace_macros(
-				get_markup_template('login_head.tpl'),
+			$a->page['htmlhead'] .= Renderer::replaceMacros(
+				Renderer::getMarkupTemplate('login_head.tpl'),
 				[
 					'$baseurl' => $a->getBaseURL(true)
 				]
 			);
 
-			$tpl = get_markup_template('login.tpl');
+			$tpl = Renderer::getMarkupTemplate('login.tpl');
 			$_SESSION['return_path'] = $return_path;
 		}
 
-		$o .= replace_macros(
+		$o .= Renderer::replaceMacros(
 			$tpl,
 			[
 				'$dest_url'     => self::getApp()->getBaseURL(true) . '/login',