Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/classes/User.php b/classes/User.php
index 1ccbdbc2174c20128845b19247040ff9d9030ab6..7a19ae3a0a04cbf9e39cdb5d724106292078d78b 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -152,34 +152,6 @@ class User extends Managed_DataObject
         return $this->getProfile()->hasPendingSubscription($other);
     }
 
-    // 'update' won't write key columns, so we have to do it ourselves.
-
-    function updateKeys(&$orig)
-    {
-        $this->_connect();
-        $parts = array();
-        foreach (array('nickname', 'email', '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 true;
-        }
-        $toupdate = implode(', ', $parts);
-
-        $table = common_database_tablename($this->tableName());
-        $qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
-          ' WHERE id = ' . $this->id;
-        $orig->decache();
-        $result = $this->query($qry);
-        if ($result) {
-            $this->encache();
-        }
-        return $result;
-    }
-
     /**
      * Get the most recent notice posted by this user, if any.
      *
@@ -276,7 +248,7 @@ class User extends Managed_DataObject
 
         if (!empty($code)) {
             $invite = Invitation::getKV($code);
-            if ($invite && $invite->address && $invite->address_type == 'email' && $invite->address == $email) {
+            if ($invite instanceof Invitation && $invite->address && $invite->address_type == 'email' && $invite->address == $email) {
                 $user->email = $invite->address;
             }
         }
@@ -686,6 +658,21 @@ class User extends Managed_DataObject
         return $this->getProfile()->isSilenced();
     }
 
+    function receivesEmailNotifications()
+    {
+        // We could do this in one large if statement, but that's not as easy to read
+        // Don't send notifications if we don't know the user's email address or it is
+        // explicitly undesired by the user's own settings.
+        if (empty($this->email) || !$this->emailnotifyattn) {
+            return false;
+        }
+        // Don't send notifications to a user who is sandboxed or silenced
+        if ($this->isSandboxed() || $this->isSilenced()) {
+            return false;
+        }
+        return true;
+    }
+
     function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null)
     {
         $stream = new RepeatedByMeNoticeStream($this);
@@ -1007,11 +994,21 @@ class User extends Managed_DataObject
         return $act;
     }
 
+    public function delPref($namespace, $topic)
+    {
+        return $this->getProfile()->delPref($namespace, $topic);
+    }
+
     public function getPref($namespace, $topic, $default=null)
     {
         return $this->getProfile()->getPref($namespace, $topic, $default);
     }
 
+    public function getConfigPref($namespace, $topic)
+    {
+        return $this->getProfile()->getConfigPref($namespace, $topic);
+    }
+
     public function setPref($namespace, $topic, $data)
     {
         return $this->getProfile()->setPref($namespace, $topic, $data);