]> git.mxchange.org Git - friendica.git/blobdiff - include/oauth.php
Cleanup /format pre-move
[friendica.git] / include / oauth.php
index 103d4c2fa9458a306f4f37e1600f8d493595678a..9fb15b492af366cb4bef9cf31bc142ebe87feb63 100644 (file)
@@ -1,8 +1,8 @@
 <?php
-/** 
+/**
  * OAuth server
  * Based on oauth2-php <http://code.google.com/p/oauth2-php/>
- * 
+ *
  */
 
 define('REQUEST_TOKEN_DURATION', 300);
@@ -15,15 +15,15 @@ class FKOAuthDataStore extends OAuthDataStore {
   function gen_token(){
                return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid())));
   }
-       
+
   function lookup_consumer($consumer_key) {
                logger(__function__.":".$consumer_key);
       //echo "<pre>"; var_dump($consumer_key); killme();
-         
+
                $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
                        dbesc($consumer_key)
                );
-               if (count($r))
+               if (dbm::is_result($r))
                        return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
                return null;
   }
@@ -35,7 +35,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        dbesc($token_type),
                        dbesc($token)
                );
-               if (count($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'];
@@ -52,7 +52,7 @@ class FKOAuthDataStore extends OAuthDataStore {
                        dbesc($nonce),
                        intval($timestamp)
                );
-               if (count($r))
+               if (dbm::is_result($r))
                        return new OAuthToken($r[0]['id'],$r[0]['secret']);
                return null;
   }
@@ -61,13 +61,13 @@ class FKOAuthDataStore extends OAuthDataStore {
                logger(__function__.":".$consumer.", ". $callback);
                $key = $this->gen_token();
                $sec = $this->gen_token();
-               
+
                if ($consumer->key){
                        $k = $consumer->key;
                } else {
                        $k = $consumer;
                }
-               
+
                $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)",
                                dbesc($key),
                                dbesc($sec),
@@ -80,19 +80,19 @@ class FKOAuthDataStore extends OAuthDataStore {
 
   function new_access_token($token, $consumer, $verifier = null) {
     logger(__function__.":".$token.", ". $consumer.", ". $verifier);
-    
+
     // return a new access token attached to this consumer
     // for the user associated with this token if the request token
     // is authorized
     // should also invalidate the request token
-    
+
     $ret=Null;
-    
+
     // get user for this verifier
     $uverifier = get_config("oauth", $verifier);
     logger(__function__.":".$verifier.",".$uverifier);
     if (is_null($verifier) || ($uverifier!==false)){
-               
+
                $key = $this->gen_token();
                $sec = $this->gen_token();
                $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)",
@@ -103,13 +103,13 @@ class FKOAuthDataStore extends OAuthDataStore {
                                intval(ACCESS_TOKEN_DURATION),
                                intval($uverifier));
                if ($r)
-                       $ret = new OAuthToken($key,$sec);               
+                       $ret = new OAuthToken($key,$sec);
        }
-               
-               
+
+
        q("DELETE FROM tokens WHERE id='%s'", $token->key);
-       
-       
+
+
        if (!is_null($ret) && $uverifier!==false){
                del_config("oauth", $verifier);
        /*      $apps = get_pconfig($uverifier, "oauth", "apps");
@@ -117,9 +117,9 @@ class FKOAuthDataStore extends OAuthDataStore {
                $apps[] = $consumer->key;
                set_pconfig($uverifier, "oauth", "apps", $apps);*/
        }
-               
+
     return $ret;
-    
+
   }
 }
 
@@ -129,14 +129,14 @@ class FKOAuth1 extends OAuthServer {
                $this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT());
                $this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1());
        }
-       
+
        function loginUser($uid){
                logger("FKOAuth1::loginUser $uid");
                $a = get_app();
-               $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+               $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(count($r)){
+               if (dbm::is_result($r)){
                        $record = $r[0];
                } else {
                   logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
@@ -148,8 +148,9 @@ class FKOAuth1 extends OAuthServer {
                $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
                $_SESSION['authenticated'] = 1;
                $_SESSION['page_flags'] = $record['page-flags'];
-               $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
+               $_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname'];
                $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
+               $_SESSION["allow_api"] = true;
 
                //notice( t("Welcome back ") . $record['username'] . EOL);
                $a->user = $record;
@@ -161,19 +162,19 @@ class FKOAuth1 extends OAuthServer {
 
                $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $a->contact = $r[0];
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
                }
-               q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+               q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d",
                        dbesc(datetime_convert()),
                        intval($_SESSION['uid'])
                );
 
-               call_hooks('logged_in', $a->user);              
+               call_hooks('logged_in', $a->user);
        }
-       
+
 }
 /*
 class FKOAuth2 extends OAuth2 {
@@ -189,13 +190,13 @@ class FKOAuth2 extends OAuth2 {
                        dbesc($client_secret),
                        dbesc($redirect_uri)
                );
-                 
+
                return $r;
        }
 
        protected function checkClientCredentials($client_id, $client_secret = NULL) {
                $client_secret = $this->db_secret($client_secret);
-               
+
                $r = q("SELECT pw FROM clients WHERE client_id = '%s'",
                        dbesc($client_id));
 
@@ -217,21 +218,21 @@ class FKOAuth2 extends OAuth2 {
        protected function getAccessToken($oauth_token) {
                $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'",
                                dbesc($oauth_token));
-       
-               if (count($r))
+
+               if (dbm::is_result($r))
                        return $r[0];
                return null;
        }
 
 
-       
+
        protected function setAccessToken($oauth_token, $client_id, $expires, $scope = NULL) {
                $r = q("INSERT INTO tokens (id, client_id, expires, scope) VALUES ('%s', '%s', %d, '%s')",
                                dbesc($oauth_token),
                                dbesc($client_id),
                                intval($expires),
                                dbesc($scope));
-                               
+
                return $r;
        }
 
@@ -245,23 +246,23 @@ class FKOAuth2 extends OAuth2 {
        protected function getAuthCode($code) {
                $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'",
                                dbesc($code));
-               
-               if (count($r))
+
+               if (dbm::is_result($r))
                        return $r[0];
                return null;
        }
 
        protected function setAuthCode($code, $client_id, $redirect_uri, $expires, $scope = NULL) {
-               $r = q("INSERT INTO auth_codes 
-                                       (id, client_id, redirect_uri, expires, scope) VALUES 
+               $r = q("INSERT INTO auth_codes
+                                       (id, client_id, redirect_uri, expires, scope) VALUES
                                        ('%s', '%s', '%s', %d, '%s')",
                                dbesc($code),
                                dbesc($client_id),
                                dbesc($redirect_uri),
                                intval($expires),
                                dbesc($scope));
-               return $r;        
-       }       
-       
+               return $r;
+       }
+
 }
 */