X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FNetwork%2FFKOAuth1.php;h=64ac4e7be54f3272f71ce8a17c65aff233c1f49d;hb=69e7c7fecac5d315930c52bfa9fb21954dcf8b5e;hp=f7f8f164173803456730e82323b80f07f97b9f90;hpb=8aff8a76eb9efc4acaab0af3c8c0ca7a011f4349;p=friendica.git diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php index f7f8f16417..64ac4e7be5 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Network/FKOAuth1.php @@ -7,10 +7,8 @@ namespace Friendica\Network; use Friendica\Core\Addon; use Friendica\Core\PConfig; use Friendica\Core\System; -use Friendica\Database\DBM; -use Friendica\Network\FKOAuthDataStore; -use Friendica\Util\Temporal; -use dba; +use Friendica\Database\DBA; +use Friendica\Util\DateTimeFormat; use OAuthServer; use OAuthSignatureMethod_HMAC_SHA1; use OAuthSignatureMethod_PLAINTEXT; @@ -38,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'); @@ -61,14 +59,14 @@ 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' => Temporal::utcNow()], ['uid' => $_SESSION['uid']]); + DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]); Addon::callHooks('logged_in', $a->user); }