X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=7300c686b4b209695cb719cad00847894e536267;hb=a876c208504af3ee801689886ec8cab8f3eeff00;hp=41aabe7a97811e42ace2ec2772d16a96aac5b4e9;hpb=f3fc1f36caf9139f8d72611b85849a2b7e6759c3;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 41aabe7a97..7300c686b4 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -7,18 +7,19 @@ use Friendica\App;
 use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\Util\Strings;
 
 function openid_content(App $a) {
 
 	$noid = Config::get('system','no_openid');
 	if($noid)
-		goaway(System::baseUrl());
+		$a->internalRedirect();
 
-	logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
+	Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
 
-	if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
+	if(!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) {
 
 		$openid = new LightOpenID($a->getHostName());
 
@@ -27,8 +28,8 @@ function openid_content(App $a) {
 			$authid = $_REQUEST['openid_identity'];
 
 			if(! strlen($authid)) {
-				logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
-				goaway(System::baseUrl());
+				Logger::log(L10n::t('OpenID protocol error. No ID returned.') . EOL);
+				$a->internalRedirect();
 			}
 
 			// NOTE: we search both for normalised and non-normalised form of $authid
@@ -42,7 +43,7 @@ function openid_content(App $a) {
 				AND `blocked` = 0 AND `account_expired` = 0
 				AND `account_removed` = 0 AND `verified` = 1
 				LIMIT 1",
-				DBA::escape($authid), DBA::escape(normalise_openid($authid))
+				DBA::escape($authid), DBA::escape(Strings::normaliseOpenID($authid))
 			);
 
 			if (DBA::isResult($r)) {
@@ -56,15 +57,15 @@ function openid_content(App $a) {
 				// just in case there was no return url set
 				// and we fell through
 
-				goaway(System::baseUrl());
+				$a->internalRedirect();
 			}
 
 			// Successful OpenID login - but we can't match it to an existing account.
 			// New registration?
 
-			if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
+			if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
 				notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
-				goaway(System::baseUrl());
+				$a->internalRedirect();
 			}
 
 			unset($_SESSION['register']);
@@ -73,16 +74,16 @@ function openid_content(App $a) {
 			if (is_array($attr) && count($attr)) {
 				foreach ($attr as $k => $v) {
 					if ($k === 'namePerson/friendly') {
-						$nick = notags(trim($v));
+						$nick = Strings::escapeTags(trim($v));
 					}
 					if($k === 'namePerson/first') {
-						$first = notags(trim($v));
+						$first = Strings::escapeTags(trim($v));
 					}
 					if($k === 'namePerson') {
-						$args .= '&username=' . urlencode(notags(trim($v)));
+						$args .= '&username=' . urlencode(Strings::escapeTags(trim($v)));
 					}
 					if ($k === 'contact/email') {
-						$args .= '&email=' . urlencode(notags(trim($v)));
+						$args .= '&email=' . urlencode(Strings::escapeTags(trim($v)));
 					}
 					if ($k === 'media/image/aspect11') {
 						$photosq = bin2hex(trim($v));
@@ -92,28 +93,28 @@ function openid_content(App $a) {
 					}
 				}
 			}
-			if ($nick) {
+			if (!empty($nick)) {
 				$args .= '&nickname=' . urlencode($nick);
 			}
-			elseif ($first) {
+			elseif (!empty($first)) {
 				$args .= '&nickname=' . urlencode($first);
 			}
 
-			if ($photosq) {
+			if (!empty($photosq)) {
 				$args .= '&photo=' . urlencode($photosq);
 			}
-			elseif ($photo) {
+			elseif (!empty($photo)) {
 				$args .= '&photo=' . urlencode($photo);
 			}
 
-			$args .= '&openid_url=' . urlencode(notags(trim($authid)));
+			$args .= '&openid_url=' . urlencode(Strings::escapeTags(trim($authid)));
 
-			goaway(System::baseUrl() . '/register?' . $args);
+			$a->internalRedirect('register?' . $args);
 
 			// NOTREACHED
 		}
 	}
 	notice(L10n::t('Login failed.') . EOL);
-	goaway(System::baseUrl());
+	$a->internalRedirect();
 	// NOTREACHED
 }