X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=45b80638d5e3723ea306c8ed09cf1df112a85dd6;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=ce707c4150b1195dd84572bf79cacc99cc7221de;hpb=6e44acfed6b029818ad094771919184c485f9c16;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index ce707c4150..45b80638d5 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,14 +1,17 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('library/openid.php');
 
+function openid_content(App $a) {
 
-function openid_content(App &$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);
 
@@ -22,7 +25,7 @@ function openid_content(App &$a) {
 
 			if(! strlen($authid)) {
 				logger( t('OpenID protocol error. No ID returned.') . EOL);
-				goaway(z_root());
+				goaway(System::baseUrl());
 			}
 
 			// NOTE: we search both for normalised and non-normalised form of $authid
@@ -30,7 +33,7 @@ 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`
+			$r = q("SELECT *, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user`
 				WHERE ( `openid` = '%s' OR `openid` = '%s' )
 				AND `blocked` = 0 AND `account_expired` = 0
 				AND `account_removed` = 0 AND `verified` = 1
@@ -38,7 +41,7 @@ function openid_content(App &$a) {
 				dbesc($authid), dbesc(normalise_openid($authid))
 			);
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 
 				// successful OpenID login
 
@@ -47,10 +50,10 @@ function openid_content(App &$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.
@@ -58,7 +61,7 @@ function openid_content(App &$a) {
 
 			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());
+				goaway(System::baseUrl());
 			}
 
 			unset($_SESSION['register']);
@@ -73,10 +76,10 @@ function openid_content(App &$a) {
 						$first = notags(trim($v));
 					}
 					if($k === 'namePerson') {
-						$args .= '&username=' . notags(trim($v));
+						$args .= '&username=' . urlencode(notags(trim($v)));
 					}
 					if ($k === 'contact/email') {
-						$args .= '&email=' . notags(trim($v));
+						$args .= '&email=' . urlencode(notags(trim($v)));
 					}
 					if ($k === 'media/image/aspect11') {
 						$photosq = bin2hex(trim($v));
@@ -87,27 +90,27 @@ function openid_content(App &$a) {
 				}
 			}
 			if ($nick) {
-				$args .= '&nickname=' . $nick;
+				$args .= '&nickname=' . urlencode($nick);
 			}
 			elseif ($first) {
-				$args .= '&nickname=' . $first;
+				$args .= '&nickname=' . urlencode($first);
 			}
 
 			if ($photosq) {
-				$args .= '&photo=' . $photosq;
+				$args .= '&photo=' . urlencode($photosq);
 			}
 			elseif ($photo) {
-				$args .= '&photo=' . $photo;
+				$args .= '&photo=' . urlencode($photo);
 			}
 
-			$args .= '&openid_url=' . notags(trim($authid));
+			$args .= '&openid_url=' . urlencode(notags(trim($authid)));
 
-			goaway(App::get_baseurl() . '/register' . $args);
+			goaway(System::baseUrl() . '/register?' . $args);
 
 			// NOTREACHED
 		}
 	}
 	notice( t('Login failed.') . EOL);
-	goaway(z_root());
+	goaway(System::baseUrl());
 	// NOTREACHED
 }