reply_to is now stored on the notice, not on the reply record

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

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 673258f820107bf20db39cb252abdaca7abbe508..ad4bb968ffb0a9deb5f3f12415a988f2a3ad1734 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -23,26 +23,17 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class ProfilesettingsAction extends SettingsAction {
 
-       function show_top($arr) {
-               $msg = $arr[0];
-               $success = $arr[1];
-               if ($msg) {
-                       $this->message($msg, $success);
-               } else {
-                       common_element('div', 'instructions',
-                                                  _t('You can update your personal profile info here '.
-                                                         'so people know more about you.'));
-               }
-               $this->settings_menu();
+       function get_instructions() {
+               return _t('You can update your personal profile info here '.
+                                 'so people know more about you.');
        }
-       
+
        function show_form($msg=NULL, $success=false) {
                $user = common_current_user();
                $profile = $user->getProfile();
-               common_show_header(_t('Profile settings'), NULL, array($msg, $success),
-                                                  array($this, 'show_top'));
+               $this->form_header(_t('Profile settings'), $msg, $success);
 
-               common_element_start('form', array('method' => 'POST',
+               common_element_start('form', array('method' => 'post',
                                                                                   'id' => 'profilesettings',
                                                                                   'action' =>
                                                                                   common_local_url('profilesettings')));
@@ -70,7 +61,7 @@ class ProfilesettingsAction extends SettingsAction {
        }
 
        function handle_post() {
-               
+
                $nickname = $this->trimmed('nickname');
                $fullname = $this->trimmed('fullname');
                $email = $this->trimmed('email');
@@ -79,8 +70,8 @@ class ProfilesettingsAction extends SettingsAction {
                $location = $this->trimmed('location');
 
                # 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 +79,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.'));
@@ -108,22 +102,22 @@ class ProfilesettingsAction extends SettingsAction {
                        $this->show_form(_t('Email address already exists.'));
                        return;
                }
-               
+
                $user = common_current_user();
 
                $user->query('BEGIN');
 
-               if (strcmp($user->nickname, $nickname) != 0) {
-                       
+               if ($user->nickname != $nickname) {
+
                        common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
                                                 __FILE__);
-                       
+
                        $original = clone($user);
-               
+
                        $user->nickname = $nickname;
 
                        $result = $user->updateKeys($original);
-               
+
                        if ($result === FALSE) {
                                common_log_db_error($user, 'UPDATE', __FILE__);
                                common_server_error(_t('Couldnt update user.'));
@@ -131,33 +125,35 @@ class ProfilesettingsAction extends SettingsAction {
                        }
                }
 
-               if (strcmp($user->email, $email) != 0) {
-                       
-                       common_debug('Updating user email from ' . $user->nickname . ' to ' . $nickname,
+               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->code = common_good_rand(16);
+
+                       $confirm = new Confirm_address();
+
+                       $confirm->code = common_confirmation_code(128);
                        $confirm->user_id = $user->id;
                        $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,
                                                                 $profile->nickname,
                                                                 $email);
                }
-               
+
                $profile = $user->getProfile();
 
                $orig_profile = clone($profile);
@@ -169,8 +165,11 @@ 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) {
                        common_log_db_error($profile, 'UPDATE', __FILE__);
                        common_server_error(_t('Couldnt save profile.'));
@@ -183,7 +182,7 @@ class ProfilesettingsAction extends SettingsAction {
 
                $this->show_form(_t('Settings saved.'), TRUE);
        }
-       
+
        function nickname_exists($nickname) {
                $user = common_current_user();
                $other = User::staticGet('nickname', $nickname);
@@ -193,7 +192,7 @@ class ProfilesettingsAction extends SettingsAction {
                        return $other->id != $user->id;
                }
        }
-       
+
        function email_exists($email) {
                $user = common_current_user();
                $other = User::staticGet('email', $email);
@@ -203,4 +202,4 @@ class ProfilesettingsAction extends SettingsAction {
                        return $other->id != $user->id;
                }
        }
-}
\ No newline at end of file
+}