type -> address_type

[quix0rs-gnu-social.git] / actions / profilesettings.php

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 1b7c75d47991366b1997dc0a8459e7bca2777ce7..44243f310d95adcd8318b910c81f0d5b28643332 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -80,7 +80,7 @@ class ProfilesettingsAction extends SettingsAction {
 
                # Some validation
                
-               if (!Validate::email($email, true)) {
+               if ($email && !Validate::email($email, true)) {
                        $this->show_form(_t('Not a valid email address.'));
                        return;
                } else if (!Validate::string($nickname, array('min_length' => 1,
@@ -88,6 +88,9 @@ class ProfilesettingsAction extends SettingsAction {
                                                                                                          'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
                        $this->show_form(_t('Nickname must have only letters and numbers and no spaces.'));
                        return;
+               } else if (!User::allowed_nickname($nickname)) {
+                       $this->show_form(_t('Not a valid nickname.'));
+                       return;
                } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
                                   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
                        $this->show_form(_t('Homepage is not a valid URL.'));
@@ -110,35 +113,49 @@ class ProfilesettingsAction extends SettingsAction {
                }
                
                $user = common_current_user();
-               assert(!is_null($user)); # should already be checked
 
                $user->query('BEGIN');
-               
-               $original = clone($user);
 
-               $user->nickname = $nickname;
+               if ($user->nickname != $nickname) {
+                       
+                       common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
+                                                __FILE__);
+                       
+                       $original = clone($user);
+               
+                       $user->nickname = $nickname;
 
-               $result = $user->update($original);
+                       $result = $user->updateKeys($original);
                
-               if (!$result) {
-                       common_log_db_error($user, 'UPDATE', __FILE__);
-                       common_server_error(_t('Couldnt update user.'));
-                       return;
+                       if ($result === FALSE) {
+                               common_log_db_error($user, 'UPDATE', __FILE__);
+                               common_server_error(_t('Couldnt update user.'));
+                               return;
+                       }
                }
 
-               if ($email != $original->email) {
+               if ($user->email != $email) {
+                       
+                       common_debug('Updating user email from ' . $user->email . ' to ' . $email,
+                                                __FILE__);
+                       
+                       # We don't update email directly; it gets done by confirmemail
+
+                       $confirm = new Confirm_address();
                        
-                       $confirm = new Confirm_email();
-                       $confirm->code = common_good_rand(16);
+                       $confirm->code = common_confirmation_code(128);
                        $confirm->user_id = $user->id;
-                       $confirm->email = $email;
+                       $confirm->address = $email;
+                       $confirm->address_type = 'email';
                        
                        $result = $confirm->insert();
+                       
                        if (!$result) {
                                common_log_db_error($confirm, 'INSERT', __FILE__);
                                common_server_error(_t('Couldnt confirm email.'));
                                return FALSE;
                        }
+                       
                        # XXX: try not to do this in the middle of a transaction
                
                        mail_confirm_address($confirm->code,
@@ -157,6 +174,9 @@ class ProfilesettingsAction extends SettingsAction {
                $profile->location = $location;
                $profile->profileurl = common_profile_url($nickname);
 
+               common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
+               common_debug('New profile: ' . common_log_objstring($profile), __FILE__);
+               
                $result = $profile->update($orig_profile);
                
                if (!$result) {
@@ -191,4 +211,4 @@ class ProfilesettingsAction extends SettingsAction {
                        return $other->id != $user->id;
                }
        }
-}
\ No newline at end of file
+}