X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FFKOAuth1.php;h=33fdf0ac22732b48002be5bdb5e73642bf711320;hb=b0411b46c44697e40832a8de5e3830479e04d86b;hp=768cae7d1b23b458e95d92f891db9ec3599b3fc0;hpb=547e24b443a44bffa5f2a0fa742f59f60335a89a;p=friendica.git

diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index 768cae7d1b..33fdf0ac22 100644
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -1,18 +1,18 @@
 <?php
 /**
- * @file src/Protocol/OAuth1.php
+ * @file src/Network/FKOAuth1.php
  */
 namespace Friendica\Network;
 
-use Friendica\App;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Network\FKOAuthDataStore;
-use dba;
-
-require_once "library/OAuth1.php";
-require_once "include/plugin.php";
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
+use OAuthServer;
+use OAuthSignatureMethod_HMAC_SHA1;
+use OAuthSignatureMethod_PLAINTEXT;
 
 /**
  * @brief OAuth protocol
@@ -32,15 +32,16 @@ class FKOAuth1 extends OAuthServer
 	/**
 	 * @param string $uid user id
 	 * @return void
+	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function loginUser($uid)
+	public function loginUser($uid)
 	{
-		logger("FKOAuth1::loginUser $uid");
-		$a = get_app();
-		$record = dba::select('user', array(), array('uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1), array('limit' => 1));
+		Logger::log("FKOAuth1::loginUser $uid");
+		$a = \get_app();
+		$record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
 
-		if (!DBM::is_result($record)) {
-			logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+		if (!DBA::isResult($record)) {
+			Logger::log('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), Logger::DEBUG);
 			header('HTTP/1.0 401 Unauthorized');
 			die('This api requires login');
 		}
@@ -60,16 +61,15 @@ class FKOAuth1 extends OAuthServer
 			$a->timezone = $a->user['timezone'];
 		}
 
-		$r = dba::select('contact', array(), array('uid' => $_SESSION['uid'], 'self' => 1), array('limit' => 1));
-		
-		if (DBM::is_result($r)) {
-			$a->contact = $r;
-			$a->cid = $r['id'];
+		$contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => 1]);
+		if (DBA::isResult($contact)) {
+			$a->contact = $contact;
+			$a->cid = $contact['id'];
 			$_SESSION['cid'] = $a->cid;
 		}
 
-		dba::update('user', ['login_date' => datetime_convert()], ['uid' => $_SESSION['uid']]);
+		DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
 
-		call_hooks('logged_in', $a->user);
+		Hook::callAll('logged_in', $a->user);
 	}
 }