X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=af7016c32b0dcd640566685786345f1e840026d3;hb=e0b33b36a21d7803353692372d7ceb90683d8888;hp=e2cea7d851041211610748b3483a1fcd29193ba9;hpb=64a2b00cdc97e40ac8e9dc8f0b9cdc5d78cdf2c2;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
old mode 100755
new mode 100644
index e2cea7d851..af7016c32b
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,14 +1,19 @@
 <?php
+/**
+ * @file mod/openid.php
+ */
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-require_once('library/openid.php');
+function openid_content(App $a) {
 
-
-function openid_content(&$a) {
-
-	$noid = get_config('system','no_openid');
+	$noid = Config::get('system','no_openid');
 	if($noid)
-		goaway(z_root());
+		goaway(System::baseUrl());
 
 	logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
 
@@ -18,20 +23,28 @@ function openid_content(&$a) {
 
 		if($openid->validate()) {
 
-			$authid = normalise_openid($_REQUEST['openid_identity']);
+			$authid = $_REQUEST['openid_identity'];
 
 			if(! strlen($authid)) {
-				logger( t('OpenID protocol error. No ID returned.') . EOL);
-				goaway(z_root());
+				logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
+				goaway(System::baseUrl());
 			}
 
-			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
-				FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 
-				AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
-				dbesc($authid)
+			// NOTE: we search both for normalised and non-normalised form of $authid
+			//       because the normalization step was removed from setting
+			//       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",
+				dbesc($authid), dbesc(normalise_openid($authid))
 			);
 
-			if($r && count($r)) {
+			if (DBM::is_result($r)) {
 
 				// successful OpenID login
 
@@ -40,57 +53,67 @@ function openid_content(&$a) {
 				require_once('include/security.php');
 				authenticate_success($r[0],true,true);
 
-				// just in case there was no return url set 
+				// just in case there was no return url set
 				// and we fell through
 
-				goaway(z_root());
+				goaway(System::baseUrl());
 			}
 
 			// Successful OpenID login - but we can't match it to an existing account.
 			// New registration?
 
-			if($a->config['register_policy'] == REGISTER_CLOSED) {
-				notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
-				goaway(z_root());
+			if ($a->config['register_policy'] == REGISTER_CLOSED) {
+				notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
+				goaway(System::baseUrl());
 			}
 
 			unset($_SESSION['register']);
 			$args = '';
 			$attr = $openid->getAttributes();
-			if(is_array($attr) && count($attr)) {
-				foreach($attr as $k => $v) {
-					if($k === 'namePerson/friendly')
+			if (is_array($attr) && count($attr)) {
+				foreach ($attr as $k => $v) {
+					if ($k === 'namePerson/friendly') {
 						$nick = notags(trim($v));
-					if($k === 'namePerson/first')
+					}
+					if($k === 'namePerson/first') {
 						$first = notags(trim($v));
-					if($k === 'namePerson')
-						$args .= '&username=' . notags(trim($v));
-					if($k === 'contact/email')
-						$args .= '&email=' . notags(trim($v));
-					if($k === 'media/image/aspect11')
+					}
+					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')
+					}
+					if ($k === 'media/image/default') {
 						$photo = bin2hex(trim($v));
+					}
 				}
 			}
-			if($nick)
-				$args .= '&nickname=' . $nick;
-			elseif($first)
-				$args .= '&nickname=' . $first;
+			if ($nick) {
+				$args .= '&nickname=' . urlencode($nick);
+			}
+			elseif ($first) {
+				$args .= '&nickname=' . urlencode($first);
+			}
 
-			if($photosq)
-				$args .= '&photo=' . $photosq;
-			elseif($photo)
-				$args .= '&photo=' . $photo;
+			if ($photosq) {
+				$args .= '&photo=' . urlencode($photosq);
+			}
+			elseif ($photo) {
+				$args .= '&photo=' . urlencode($photo);
+			}
 
-			$args .= '&openid_url=' . notags(trim($authid));
+			$args .= '&openid_url=' . urlencode(notags(trim($authid)));
 
-			goaway($a->get_baseurl() . '/register' . $args);
+			goaway(System::baseUrl() . '/register?' . $args);
 
 			// NOTREACHED
 		}
 	}
-	notice( t('Login failed.') . EOL);
-	goaway(z_root());
+	notice(L10n::t('Login failed.') . EOL);
+	goaway(System::baseUrl());
 	// NOTREACHED
 }