update keys for incomingemail

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

diff --git a/classes/User.php b/classes/User.php
index da70a24f0bd5d271a8f990bba44dafdb6d532d92..e4928eb34af7200f39a5fbd15a5ca16a1367abaf 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,7 +34,9 @@ class User extends DB_DataObject
     public $nickname;                        // varchar(64)  unique_key
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
-    public $emailnotifysub;                  // tinyint(1)  unique_key default_1
+    public $incomingemail;                   // varchar(255)  unique_key
+    public $emailnotifysub;                  // tinyint(1)   default_1
+    public $emailpost;                       // tinyint(1)   default_1
     public $jabber;                          // varchar(255)  unique_key
     public $jabbernotify;                    // tinyint(1)  
     public $jabberreplies;                   // tinyint(1)  
@@ -42,7 +44,10 @@ class User extends DB_DataObject
     public $sms;                             // varchar(64)  unique_key
     public $carrier;                         // int(4)  
     public $smsnotify;                       // tinyint(1)  
+    public $smsreplies;                      // tinyint(1)  
+    public $smsemail;                        // varchar(255)  
     public $uri;                             // varchar(255)  unique_key
+    public $autosubscribe;                   // tinyint(1)  
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
@@ -74,7 +79,7 @@ class User extends DB_DataObject
 
        function updateKeys(&$orig) {
                $parts = array();
-               foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) {
+               foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail') as $k) {
                        if (strcmp($this->$k, $orig->$k) != 0) {
                                $parts[] = $k . ' = ' . $this->_quote($this->$k);
                        }
@@ -105,4 +110,22 @@ class User extends DB_DataObject
                }
                return $profile->getCurrentNotice($dt);
        }
+       
+       function getCarrier() {
+               return Sms_carrier::staticGet($this->carrier);
+       }
+       
+       function subscribeTo($other) {
+               $sub = new Subscription();
+               $sub->subscriber = $this->id;
+               $sub->subscribed = $other->id;
+
+               $sub->created = DB_DataObject_Cast::dateTime(); # current time
+
+               if (!$sub->insert()) {
+                       return false;
+               }
+               
+               return true;
+       }
 }