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

diff --git a/classes/User.php b/classes/User.php
index 99aac626f8..bf13e1e34c 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,8 +34,10 @@ 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)  
@@ -69,7 +71,7 @@ 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', 'jabber', 'sms', 'carrier') as $k) {
@@ -82,16 +84,16 @@ class User extends DB_DataObject
 			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');
+								  'search', 'avatar');
 		$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
 		return !in_array($nickname, $merged);
 	}