X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser.php;h=bf13e1e34c170e2c4447b739090d2294081bc42c;hb=fe77b3445c5721f81e99b292f06f4ff3ab823022;hp=e8667d6975febd0fb51a087b82a8fdbfd686f3fc;hpb=2b258b1a9ad9049c19f264187372553fe9b1c09d;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index e8667d6975..bf13e1e34c 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,6 +34,14 @@ 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)   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 $uri;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -63,21 +71,38 @@ 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', 'sms', 'carrier') 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);
+	}
 }