don't get a count from query

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

diff --git a/classes/User.php b/classes/User.php
index e8667d6975febd0fb51a087b82a8fdbfd686f3fc..b6689761eec4159faf62fbd15da775fe02a2f197 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,7 +34,20 @@ class User extends DB_DataObject
     public $nickname;                        // varchar(64)  unique_key
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
+    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)  
+    public $updatefrompresence;              // tinyint(1)  
+    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
 
@@ -63,21 +76,69 @@ class User extends DB_DataObject
        }
 
        # 'update' won't write key columns, so we have to do it ourselves.
-       
+
        function updateKeys(&$orig) {
                $parts = array();
-               foreach (array('nickname', 'email') as $k) {
-                       if ($this->$k != $orig->$k) {
-                               $parts[] = $k . '=' . $this->_quote($this->$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);
                        }
                }
                if (count($parts) == 0) {
                        # No changes
-                       return;
+                       return true;
                }
                $toupdate = implode(', ', $parts);
-               $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . 
+               $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
                  ' WHERE id = ' . $this->id;
                return $this->query($qry);
        }
+
+       function allowed_nickname($nickname) {
+               # XXX: should already be validated for size, content, etc.
+               static $blacklist = array('rss', 'xrds', 'doc', 'main',
+                                                                 'settings', 'notice', 'user',
+                                                                 'search', 'avatar');
+               $merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
+               return !in_array($nickname, $merged);
+       }
+
+       function getCurrentNotice($dt=NULL) {
+               $profile = $this->getProfile();
+               if (!$profile) {
+                       return NULL;
+               }
+               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;
+       }
+
+       function noticesWithFriends($offset=0, $limit=20) {
+               
+               $notice = new Notice();
+               
+               $notice->query('SELECT notice.* ' .
+                                          'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
+                                          'WHERE subscription.subscriber = ' . $this->id . ' ' .
+                                          'ORDER BY created DESC, notice.id DESC ' .
+                                          'LIMIT ' . $offset . ', ' . $limit);
+               
+               return $notice;
+       }
 }