Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / classes / Oauth_application_user.php

diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index 3d4238d640fc4db3e4055477e157acbef97ee45f..834e38d2be66ce22a3a52b00979f37fd9007f92a 100644 (file)
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -24,20 +24,51 @@ class Oauth_application_user extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    static function getByKeys($user, $app)
+    static function getByUserAndToken($user, $token)
     {
-        if (empty($user) || empty($app)) {
+        if (empty($user) || empty($token)) {
             return null;
         }
 
         $oau = new Oauth_application_user();
 
-        $oau->profile_id     = $user->id;
-        $oau->application_id = $app->id;
+        $oau->profile_id = $user->id;
+        $oau->token      = $token;
         $oau->limit(1);
 
         $result = $oau->find(true);
 
         return empty($result) ? null : $oau;
     }
+
+    function updateKeys(&$orig)
+    {
+        $this->_connect();
+        $parts = array();
+        foreach (array('profile_id', 'application_id', 'token', 'access_type') as $k) {
+            if (strcmp($this->$k, $orig->$k) != 0) {
+                $parts[] = $k . ' = ' . $this->_quote($this->$k);
+            }
+        }
+        if (count($parts) == 0) {
+            // No changes
+            return true;
+        }
+        $toupdate = implode(', ', $parts);
+
+        $table = $this->tableName();
+        if(common_config('db','quote_identifiers')) {
+            $table = '"' . $table . '"';
+        }
+        $qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
+          ' WHERE profile_id = ' . $orig->profile_id
+          . ' AND application_id = ' . $orig->application_id
+          . " AND token = '$orig->token'";
+        $orig->decache();
+        $result = $this->query($qry);
+        if ($result) {
+            $this->encache();
+        }
+        return $result;
+    }
 }