Changed the OAuth app tables to refer to profiles instead of users.

Added an owner column to oauth_application.

2 files changed, 19 insertions, 18 deletions

diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index 6ad2db6dd..e2862bf97 100755..100644
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -2,32 +2,33 @@
 /**
  * Table Definition for oauth_application
  */
-require_once 'classes/Memcached_DataObject';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Oauth_application extends Memcached_DataObject 
+class Oauth_application extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'oauth_application';               // table name
     public $id;                              // int(4)  primary_key not_null
+    public $owner;                           // int(4)   not_null
     public $consumer_key;                    // varchar(255)   not_null
     public $name;                            // varchar(255)   not_null
-    public $description;                     // varchar(255)  
+    public $description;                     // varchar(255)
     public $icon;                            // varchar(255)   not_null
-    public $source_url;                      // varchar(255)  
-    public $organization;                    // varchar(255)  
-    public $homepage;                        // varchar(255)  
+    public $source_url;                      // varchar(255)
+    public $organization;                    // varchar(255)
+    public $homepage;                        // varchar(255)
     public $callback_url;                    // varchar(255)   not_null
-    public $type;                            // tinyint(1)  
-    public $access_type;                     // tinyint(1)  
+    public $type;                            // tinyint(1)
+    public $access_type;                     // tinyint(1)
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); }
-
+    function staticGet($k,$v=NULL) {
+	return Memcached_DataObject::staticGet('Oauth_application',$k,$v);
+    }
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 }
diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index a8922f5e7..9e45ece25 100755..100644
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -2,23 +2,23 @@
 /**
  * Table Definition for oauth_application_user
  */
-require_once 'classes/Memcached_DataObject';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Oauth_application_user extends Memcached_DataObject 
+class Oauth_application_user extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'oauth_application_user';          // table name
-    public $user_id;                         // int(4)  primary_key not_null
+    public $profile_id;                      // int(4)  primary_key not_null
     public $application_id;                  // int(4)  primary_key not_null
-    public $access_type;                     // tinyint(1)  
+    public $access_type;                     // tinyint(1)
     public $created;                         // datetime   not_null
 
     /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v); }
-
+    function staticGet($k,$v=NULL) {
+	return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v);
+    }
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 }