Merge branch 'master' into social-master

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

diff --git a/classes/Nonce.php b/classes/Nonce.php
index 486a65a3c7e2aa6d78bc8478f579b27e8d80ab93..9d8dfece044b8ee740c41fefca852800e2828219 100644 (file)
--- a/classes/Nonce.php
+++ b/classes/Nonce.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Nonce extends Memcached_DataObject
+class Nonce extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -17,9 +17,37 @@ class Nonce extends Memcached_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Nonce',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    /**
+     * Compatibility hack for PHP 5.3
+     *
+     * The statusnet.links.ini entry cannot be read because "," is no longer
+     * allowed in key names when read by parse_ini_file().
+     *
+     * @return   array
+     * @access   public
+     */
+    function links()
+    {
+        return array('consumer_key,token' => 'token:consumer_key,token');
+    }
+
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'OAuth nonce record',
+            'fields' => array(
+                'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
+                'tok' => array('type' => 'char', 'length' => 32, 'description' => 'buggy old value, ignored'),
+                'nonce' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'nonce'),
+                'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
+
+                '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', 'ts', 'nonce'),
+        );
+    }
 }