less tricky with recoverpassword

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

diff --git a/classes/User.php b/classes/User.php
index e8281a72318a3222f6efaf1e35ee09dc1faaf3d8..370dad82f797e24b43aa8c5f7f8ba652470ceba3 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,6 +34,12 @@ class User extends DB_DataObject
     public $nickname;                        // varchar(64)  unique_key
     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
@@ -66,18 +72,26 @@ class User extends DB_DataObject
        
        function updateKeys(&$orig) {
                $parts = array();
-               foreach (array('nickname', 'email') as $k) {
-                       if ($this->$k != $orig->$k) {
-                               $parts[] = $k . '="' . $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 . 
                  ' 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);
+       }
 }