less tricky with recoverpassword

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

diff --git a/classes/User.php b/classes/User.php
index 0e7fd5447448d5b24b2f1e1a5ed1adbb4de77ec0..370dad82f797e24b43aa8c5f7f8ba652470ceba3 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -35,8 +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
@@ -83,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);
+       }
 }