X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=613cd222f605e962301492f73f4a8d033fb9c7a7;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=5707b1b72891cc7e28874869aeabc48110a15a8f;hpb=2b161108fe6552ef2effb7b300553f0242b2e49e;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 5707b1b728..613cd222f6 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) {
 
-	$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,8 @@ function openid_content(App $a) {
 			//       mod/settings.php in 8367cad so it might have left mixed
 			//       records in the user table
 			//
-			$r = q("SELECT *, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user`
+			$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
@@ -38,7 +42,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
 
@@ -50,7 +54,7 @@ function openid_content(App $a) {
 				// 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 +62,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']);
@@ -102,12 +106,12 @@ function openid_content(App $a) {
 
 			$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
 }