X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=98748c21d8d7ad9f4861d900754114a0d7ee86b9;hb=ac9b3b78457f466980c7300cea602d78e7af8d45;hp=3e9486a6d88082bee974be412cf90993d0211701;hpb=2ef81108b37a85642e1f3380044a03cb1cd8719a;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 3e9486a6d8..98748c21d8 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -4,31 +4,31 @@
  */
 
 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\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\Util\Strings;
 
 function openid_content(App $a) {
 
-	$noid = Config::get('system','no_openid');
-	if($noid)
-		$a->redirect();
+	if (Config::get('system','no_openid')) {
+		$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());
 
-		if($openid->validate()) {
-
-			$authid = $_REQUEST['openid_identity'];
+		if ($openid->validate()) {
+			$authid = $openid->data['openid_identity'];
 
-			if(! strlen($authid)) {
-				logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
-				$a->redirect();
+			if (empty($authid)) {
+				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
@@ -36,84 +36,43 @@ function openid_content(App $a) {
 			//       mod/settings.php in 8367cad so it might have left mixed
 			//       records in the user table
 			//
-			$r = q("SELECT *
-				FROM `user`
-				WHERE ( `openid` = '%s' OR `openid` = '%s' )
-				AND `blocked` = 0 AND `account_expired` = 0
-				AND `account_removed` = 0 AND `verified` = 1
-				LIMIT 1",
-				DBA::escape($authid), DBA::escape(normalise_openid($authid))
-			);
-
-			if (DBA::isResult($r)) {
+			$condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
+				'openid' => [$authid, Strings::normaliseOpenID($authid)]];
+			$user  = DBA::selectFirst('user', [], $condition);
+			if (DBA::isResult($user)) {
 
 				// successful OpenID login
 
 				unset($_SESSION['openid']);
 
-				Authentication::setAuthenticatedSessionForUser($r[0],true,true);
+				Session::setAuthenticatedForUser($a, $user, true, true);
 
 				// just in case there was no return url set
 				// and we fell through
 
-				$a->redirect();
+				$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) {
-				notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
-				$a->redirect();
-			}
-
 			unset($_SESSION['register']);
-			$args = '';
-			$attr = $openid->getAttributes();
-			if (is_array($attr) && count($attr)) {
-				foreach ($attr as $k => $v) {
-					if ($k === 'namePerson/friendly') {
-						$nick = notags(trim($v));
-					}
-					if($k === 'namePerson/first') {
-						$first = notags(trim($v));
-					}
-					if($k === 'namePerson') {
-						$args .= '&username=' . urlencode(notags(trim($v)));
-					}
-					if ($k === 'contact/email') {
-						$args .= '&email=' . urlencode(notags(trim($v)));
-					}
-					if ($k === 'media/image/aspect11') {
-						$photosq = bin2hex(trim($v));
-					}
-					if ($k === 'media/image/default') {
-						$photo = bin2hex(trim($v));
-					}
-				}
-			}
-			if ($nick) {
-				$args .= '&nickname=' . urlencode($nick);
+			Session::set('openid_attributes', $openid->getAttributes());
+			Session::set('openid_identity', $authid);
+
+			// Detect the server URL
+			$open_id_obj = new LightOpenID($a->getHostName());
+			$open_id_obj->identity = $authid;
+			Session::set('openid_server', $open_id_obj->discover($open_id_obj->identity));
+
+			if (intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
+				notice(L10n::t('Account not found. Please login to your existing account to add the OpenID to it.'));
+			} else {
+				notice(L10n::t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
 			}
-			elseif ($first) {
-				$args .= '&nickname=' . urlencode($first);
-			}
-
-			if ($photosq) {
-				$args .= '&photo=' . urlencode($photosq);
-			}
-			elseif ($photo) {
-				$args .= '&photo=' . urlencode($photo);
-			}
-
-			$args .= '&openid_url=' . urlencode(notags(trim($authid)));
-
-			$a->redirect('register?' . $args);
 
-			// NOTREACHED
+			$a->internalRedirect('login');
 		}
 	}
 	notice(L10n::t('Login failed.') . EOL);
-	$a->redirect();
+	$a->internalRedirect();
 	// NOTREACHED
 }