X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FConsumer.php;h=4121938ed864fd090ab25164980267492a8d737c;hb=f9698598c6aa74d5f5e060989871f8e90d310adf;hp=ce399f2783f7e965b59ecc85effe0078f696193c;hpb=509c8fc51589a4cc6a3281e012ce759ab9bed532;p=quix0rs-gnu-social.git

diff --git a/classes/Consumer.php b/classes/Consumer.php
index ce399f2783..4121938ed8 100644
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -4,29 +4,41 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Consumer extends Memcached_DataObject
+class Consumer extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'consumer';                        // table name
-    public $consumer_key;                    // varchar(255)  primary_key not_null
-    public $consumer_secret;                 // varchar(255)   not_null
+    public $consumer_key;                    // varchar(191)  primary_key not_null   not 255 because utf8mb4 takes more space
+    public $consumer_secret;                 // varchar(191)   not_null   not 255 because utf8mb4 takes more space
     public $seed;                            // char(32)   not_null
     public $created;                         // datetime   not_null
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Consumer',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'OAuth consumer record',
+            'fields' => array(
+                'consumer_key' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'unique identifier, root URL'),
+                'consumer_secret' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'secret value'),
+                'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('consumer_key'),
+        );
+    }
+
     static function generateNew()
     {
         $cons = new Consumer();
-        $rand = common_good_rand(16);
+        $rand = common_random_hexstr(16);
 
         $cons->seed            = $rand;
         $cons->consumer_key    = md5(time() + $rand);
@@ -42,14 +54,14 @@ class Consumer extends Memcached_DataObject
      * XXX: Should this happen in an OAuthDataStore instead?
      *
      */
-    function delete()
+    function delete($useWhere=false)
     {
         // XXX: Is there any reason NOT to do this kind of cleanup?
 
         $this->_deleteTokens();
         $this->_deleteNonces();
 
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     function _deleteTokens()
@@ -65,5 +77,4 @@ class Consumer extends Memcached_DataObject
         $nonce->consumer_key = $this->consumer_key;
         $nonce->delete();
     }
-
 }