Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline...

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

diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index f0c354babb61aa70973de3ce311ff462b84cf6a9..4b9bec64c63c4bbf5e37162766f905fed0a9c5c2 100644 (file)
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for confirm_address
  */
-require_once 'DB/DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Confirm_address extends DB_DataObject 
+class Confirm_address extends Memcached_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -13,12 +13,51 @@ class Confirm_address extends DB_DataObject
     public $code;                            // varchar(32)  primary_key not_null
     public $user_id;                         // int(4)   not_null
     public $address;                         // varchar(255)   not_null
-    public $address_type;                    // varchar(32)   not_null
+    public $address_extra;                   // varchar(255)   not_null
+    public $address_type;                    // varchar(8)   not_null
+    public $claimed;                         // datetime()  
+    public $sent;                            // datetime()  
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Confirm_address',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Confirm_address',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    function sequenceKey()
+    { return array(false, false); }
+
+    static function getAddress($address, $addressType)
+    {
+        $ca = new Confirm_address();
+
+        $ca->address      = $address;
+        $ca->address_type = $addressType;
+
+        if ($ca->find(true)) {
+            return $ca;
+        }
+
+        return null;
+    }
+
+    static function saveNew($user, $address, $addressType, $extra=null)
+    {
+        $ca = new Confirm_address();
+
+        if (!empty($user)) {
+            $ca->user_id = $user->id;
+        }
+
+        $ca->address       = $address;
+        $ca->address_type  = $addressType;
+        $ca->address_extra = $extra;
+        $ca->code          = common_confirmation_code(64);
+
+        $ca->insert();
+
+        return $ca;
+    }
 }