X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2FUser.php;h=370dad82f797e24b43aa8c5f7f8ba652470ceba3;hb=ae18afc070df751d948ef553ced1dc5da90440b7;hp=78815a72ea972b1ac4c69fa93fe04c5ccdde9fd6;hpb=b19c86bd0065ee3a13ced9be3244d8dc007d2ee6;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index 78815a72ea..370dad82f7 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -35,7 +35,11 @@ class User extends DB_DataObject
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
     public $jabber;                          // varchar(255)  unique_key
+    public $jabbernotify;                    // 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
@@ -68,7 +72,7 @@ class User extends DB_DataObject
 	
 	function updateKeys(&$orig) {
 		$parts = array();
-		foreach (array('nickname', 'email') as $k) {
+		foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) {
 			if (strcmp($this->$k, $orig->$k) != 0) {
 				$parts[] = $k . ' = ' . $this->_quote($this->$k);
 			}
@@ -82,4 +86,12 @@ class User extends DB_DataObject
 		  ' 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');
+		$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
+		return !in_array($nickname, $merged);
+	}
 }