Move Temporal::convert() to DateTimeFormat::convert()

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

diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index 07e15ad51ee72a2fd0f8659a7a27b8beea092f74..8af267be3de557ab082220e14aeed30403b972c8 100644 (file)
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -1,21 +1,19 @@
 <?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 Friendica\Util\DateTimeFormat;
 use dba;
 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
@@ -63,16 +61,15 @@ class FKOAuth1 extends OAuthServer
                        $a->timezone = $a->user['timezone'];
                }
 
-               $r = dba::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => 1]);
-               
-               if (DBM::is_result($r)) {
-                       $a->contact = $r;
-                       $a->cid = $r['id'];
+               $contact = dba::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => 1]);
+               if (DBM::is_result($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);
        }
 }