]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - actions/profilesettings.php
bug in userbyid
[quix0rs-gnu-social.git] / actions / profilesettings.php
index e94d846bdfa2dbae175551d81d68c9910643e827..ad4bb968ffb0a9deb5f3f12415a988f2a3ad1734 100644 (file)
@@ -23,43 +23,45 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class ProfilesettingsAction extends SettingsAction {
 
+       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'));
-               $this->settings_menu();
-               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. ' .
-                                                         'Nickname must be 1-64 lowercase letters or numbers -- no punctuation or spaces. ' .
-                                                         'Full name, bio, and location can be whatever you want. Email address should be valid.'));
-               }
-               common_element_start('form', array('method' => 'POST',
+               $this->form_header(_t('Profile settings'), $msg, $success);
+
+               common_element_start('form', array('method' => 'post',
                                                                                   'id' => 'profilesettings',
                                                                                   'action' =>
                                                                                   common_local_url('profilesettings')));
                # too much common patterns here... abstractable?
                common_input('nickname', _t('Nickname'),
-                                        ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname);
+                                        ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
+                                        _t('1-64 lowercase letters or numbers, no punctuation or spaces'));
                common_input('fullname', _t('Full name'),
                                         ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
                common_input('email', _t('Email address'),
-                                        ($this->arg('email')) ? $this->arg('email') : $user->email);
+                                        ($this->arg('email')) ? $this->arg('email') : $user->email,
+                                        _t('Used only for updates, announcements, and password recovery'));
                common_input('homepage', _t('Homepage'),
-                                        ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage);
+                                        ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
+                                        _t('URL of your homepage, blog, or profile on another site'));
                common_textarea('bio', _t('Bio'),
-                                               ($this->arg('bio')) ? $this->arg('bio') : $profile->bio);
+                                               ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
+                                               _t('Describe yourself and your interests in 140 chars'));
                common_input('location', _t('Location'),
-                                        ($this->arg('location')) ? $this->arg('location') : $profile->location);
+                                        ($this->arg('location')) ? $this->arg('location') : $profile->location,
+                                        _t('Where you are, like "City, State (or Region), Country"'));
                common_submit('submit', _t('Save'));
                common_element_end('form');
                common_show_footer();
        }
 
        function handle_post() {
-               
+
                $nickname = $this->trimmed('nickname');
                $fullname = $this->trimmed('fullname');
                $email = $this->trimmed('email');
@@ -68,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,
@@ -77,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.'));
@@ -97,20 +102,56 @@ class ProfilesettingsAction extends SettingsAction {
                        $this->show_form(_t('Email address already exists.'));
                        return;
                }
-               
+
                $user = common_current_user();
-               assert(!is_null($user)); # should already be checked
 
-               # FIXME: transaction!
+               $user->query('BEGIN');
 
-               $original = clone($user);
+               if ($user->nickname != $nickname) {
 
-               $user->nickname = $nickname;
-               $user->email = $email;
+                       common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
+                                                __FILE__);
 
-               if (!$user->update($original)) {
-                       common_server_error(_t('Couldnt update user.'));
-                       return;
+                       $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.'));
+                               return;
+                       }
+               }
+
+               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->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();
@@ -124,14 +165,24 @@ class ProfilesettingsAction extends SettingsAction {
                $profile->location = $location;
                $profile->profileurl = common_profile_url($nickname);
 
-               if (FALSE === $profile->update($orig_profile)) {
+               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.'));
                        return;
                }
 
+               $user->query('COMMIT');
+
+               common_broadcast_profile($profile);
+
                $this->show_form(_t('Settings saved.'), TRUE);
        }
-       
+
        function nickname_exists($nickname) {
                $user = common_current_user();
                $other = User::staticGet('nickname', $nickname);
@@ -141,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);
@@ -151,4 +202,4 @@ class ProfilesettingsAction extends SettingsAction {
                        return $other->id != $user->id;
                }
        }
-}
\ No newline at end of file
+}