X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=41d45c1f608a887889abc087baa6119f40b67113;hb=92c4ca091193e571d76a9db7b2d4078e2b3dc473;hp=45b80638d5e3723ea306c8ed09cf1df112a85dd6;hpb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 45b80638d5..41d45c1f60 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,11 +1,13 @@
 <?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');
+use Friendica\Database\DBA;
 
 function openid_content(App $a) {
 
@@ -17,14 +19,14 @@ function openid_content(App $a) {
 
 	if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
 
-		$openid = new LightOpenID;
+		$openid = new LightOpenID($a->get_hostname());
 
 		if($openid->validate()) {
 
 			$authid = $_REQUEST['openid_identity'];
 
 			if(! strlen($authid)) {
-				logger( t('OpenID protocol error. No ID returned.') . EOL);
+				logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
 				goaway(System::baseUrl());
 			}
 
@@ -33,15 +35,16 @@ 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
 				LIMIT 1",
-				dbesc($authid), dbesc(normalise_openid($authid))
+				DBA::escape($authid), DBA::escape(normalise_openid($authid))
 			);
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 
 				// successful OpenID login
 
@@ -59,8 +62,8 @@ function openid_content(App $a) {
 			// 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);
+			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);
 				goaway(System::baseUrl());
 			}
 
@@ -110,7 +113,7 @@ function openid_content(App $a) {
 			// NOTREACHED
 		}
 	}
-	notice( t('Login failed.') . EOL);
+	notice(L10n::t('Login failed.') . EOL);
 	goaway(System::baseUrl());
 	// NOTREACHED
 }