Require statement

[friendica.git] / include / oauth.php

diff --git a/include/oauth.php b/include/oauth.php
index f67e3d2b704df539e39cfd320ead71c555948562..bb122786851d3d83b3e45ed231353a273f43bc03 100644 (file)
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -6,6 +6,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
@@ -25,7 +29,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
                        dbesc($consumer_key)
                );
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
                return null;
   }
@@ -37,7 +41,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        dbesc($token_type),
                        dbesc($token)
                );
-               if (dbm::is_result($r)){
+               if (DBM::is_result($r)){
                        $ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
                        $ot->scope=$r[0]['scope'];
                        $ot->expires = $r[0]['expires'];
@@ -54,7 +58,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        dbesc($nonce),
                        intval($timestamp)
                );
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        return new OAuthToken($r[0]['id'],$r[0]['secret']);
                return null;
   }
@@ -91,7 +95,7 @@ class FKOAuthDataStore extends OAuthDataStore {
     $ret=Null;
 
     // get user for this verifier
-    $uverifier = get_config("oauth", $verifier);
+    $uverifier = Config::get("oauth", $verifier);
     logger(__function__.":".$verifier.",".$uverifier);
     if (is_null($verifier) || ($uverifier!==false)){
 
@@ -113,11 +117,11 @@ class FKOAuthDataStore extends OAuthDataStore {
 
 
        if (!is_null($ret) && $uverifier!==false){
-               del_config("oauth", $verifier);
-       /*      $apps = get_pconfig($uverifier, "oauth", "apps");
+               Config::delete("oauth", $verifier);
+       /*      $apps = PConfig::get($uverifier, "oauth", "apps");
                if ($apps===false) $apps=array();
                $apps[] = $consumer->key;
-               set_pconfig($uverifier, "oauth", "apps", $apps);*/
+               PConfig::set($uverifier, "oauth", "apps", $apps);*/
        }
 
     return $ret;
@@ -138,7 +142,7 @@ class FKOAuth1 extends OAuthServer {
                $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
                        intval($uid)
                );
-               if (dbm::is_result($r)){
+               if (DBM::is_result($r)){
                        $record = $r[0];
                } else {
                   logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
@@ -147,24 +151,24 @@ class FKOAuth1 extends OAuthServer {
                }
                $_SESSION['uid'] = $record['uid'];
                $_SESSION['theme'] = $record['theme'];
-               $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
+               $_SESSION['mobile-theme'] = PConfig::get($record['uid'], 'system', 'mobile_theme');
                $_SESSION['authenticated'] = 1;
                $_SESSION['page_flags'] = $record['page-flags'];
-               $_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname'];
+               $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname'];
                $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
                $_SESSION["allow_api"] = true;
 
                //notice( t("Welcome back ") . $record['username'] . EOL);
                $a->user = $record;
 
-               if(strlen($a->user['timezone'])) {
+               if (strlen($a->user['timezone'])) {
                        date_default_timezone_set($a->user['timezone']);
                        $a->timezone = $a->user['timezone'];
                }
 
                $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $a->contact = $r[0];
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
@@ -221,7 +225,7 @@ class FKOAuth2 extends OAuth2 {
                $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'",
                                dbesc($oauth_token));
 
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        return $r[0];
                return null;
        }
@@ -249,7 +253,7 @@ class FKOAuth2 extends OAuth2 {
                $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'",
                                dbesc($code));
 
-               if (dbm::is_result($r))
+               if (DBM::is_result($r))
                        return $r[0];
                return null;
        }