Some more removed notices

[friendica.git] / src / Network / FKOAuth1.php

diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index 64ae3374a987c5ab25ef68c24609299612bfcfe0..64ac4e7be54f3272f71ce8a17c65aff233c1f49d 100644 (file)
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -1,21 +1,17 @@
 <?php
 /**
- * @file src/Protocol/OAuth1.php
+ * @file src/Network/FKOAuth1.php
  */
 namespace Friendica\Network;
 
-use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Network\FKOAuthDataStore;
-use dba;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 use OAuthServer;
-use OAuthSignatureMethod_PLAINTEXT;
 use OAuthSignatureMethod_HMAC_SHA1;
-
-require_once "library/OAuth1.php";
-require_once "include/plugin.php";
+use OAuthSignatureMethod_PLAINTEXT;
 
 /**
  * @brief OAuth protocol
@@ -40,9 +36,9 @@ class FKOAuth1 extends OAuthServer
        {
                logger("FKOAuth1::loginUser $uid");
                $a = get_app();
-               $record = dba::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
+               $record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
 
-               if (!DBM::is_result($record)) {
+               if (!DBA::isResult($record)) {
                        logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
                        header('HTTP/1.0 401 Unauthorized');
                        die('This api requires login');
@@ -63,15 +59,15 @@ class FKOAuth1 extends OAuthServer
                        $a->timezone = $a->user['timezone'];
                }
 
-               $contact = dba::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => 1]);
-               if (DBM::is_result($contact)) {
+               $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);
+               Addon::callHooks('logged_in', $a->user);
        }
 }