Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / EmailSummary / Email_summary_status.php

diff --git a/plugins/EmailSummary/Email_summary_status.php b/plugins/EmailSummary/Email_summary_status.php
index a0462fd04cedb8d355e6a72452bf5b508ef8e8c6..7072370faf7fdd99dae4d53cbd3534b304a221c6 100644 (file)
--- a/plugins/EmailSummary/Email_summary_status.php
+++ b/plugins/EmailSummary/Email_summary_status.php
@@ -52,9 +52,9 @@ class Email_summary_status extends Memcached_DataObject
     public $__table = 'email_summary_status'; // table name
     public $user_id;                         // int(4)  primary_key not_null
     public $send_summary;                    // tinyint not_null
-    public $last_summary;                    // int(4)  primary_key not_null
-    public $created;                         // int(4)  primary_key not_null
-    public $modified;                        // int(4)  primary_key not_null
+    public $last_summary_id;                 // int(4)  null
+    public $created;                         // datetime not_null
+    public $modified;                        // datetime not_null
 
     /**
      * Get an instance by key
@@ -82,10 +82,10 @@ class Email_summary_status extends Memcached_DataObject
     function table()
     {
         return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                    'send_summary' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                    'last_summary' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME,
-                    'created' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME,
-                    'modified' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME);
+                     'send_summary' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'last_summary_id' => DB_DATAOBJECT_INT,
+                     'created' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'modified' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
     }
 
     /**
@@ -139,11 +139,11 @@ class Email_summary_status extends Memcached_DataObject
     {
         $ess = Email_summary_status::staticGet('user_id', $user_id);
 
-       if (!empty($ess)) {
-           return $ess->send_summary;
-       } else {
-           return 1;
-       }
+        if (!empty($ess)) {
+            return $ess->send_summary;
+        } else {
+            return 1;
+        }
     }
 
     /**
@@ -154,14 +154,14 @@ class Email_summary_status extends Memcached_DataObject
      * @return Email_summary_status instance for this user, with count already incremented.
      */
 
-    static function getLastSummary($user_id)
+    static function getLastSummaryID($user_id)
     {
         $ess = Email_summary_status::staticGet('user_id', $user_id);
        
-       if (!empty($ess)) {
-           return $ess->last_summary;
-       } else {
-           return 1;
-       }
+        if (!empty($ess)) {
+            return $ess->last_summary_id;
+        } else {
+            return null;
+        }
     }
 }