X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fopenid.php;h=2c284f76d88757848459a339cfbe98bdafcfdcb9;hb=7211fc4f1ac33819ed0543ac65f9a075250c3190;hp=1dac83d2d57d7d0580a7028efdc9a29f0214ad86;hpb=a0530d1066d7268f1b1ea67bc3c254e9f9fc5ec8;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 1dac83d2d5..2c284f76d8 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,13 +1,17 @@
 <?php
+/**
+ * @file mod/openid.php
+ */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
-
-require_once('library/openid.php');
+use Friendica\Database\DBM;
 
 function openid_content(App $a) {
 
-	$noid = get_config('system','no_openid');
+	$noid = Config::get('system','no_openid');
 	if($noid)
 		goaway(System::baseUrl());
 
@@ -15,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());
 			}
 
@@ -31,7 +35,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
@@ -39,7 +44,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
 
@@ -58,7 +63,7 @@ function openid_content(App $a) {
 			// New registration?
 
 			if ($a->config['register_policy'] == REGISTER_CLOSED) {
-				notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
+				notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
 				goaway(System::baseUrl());
 			}
 
@@ -108,7 +113,7 @@ function openid_content(App $a) {
 			// NOTREACHED
 		}
 	}
-	notice( t('Login failed.') . EOL);
+	notice(L10n::t('Login failed.') . EOL);
 	goaway(System::baseUrl());
 	// NOTREACHED
 }