]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and...
authorRobin Millette <millette@controlyourself.ca>
Thu, 16 Apr 2009 17:34:19 +0000 (17:34 +0000)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 17 Apr 2009 20:57:15 +0000 (13:57 -0700)
actions/profilesettings.php
actions/register.php

index 60f7c0796e2c64246f9064c25db02d70e4361016..fb847680b9c158e85dc319d89029933edddabc2d 100644 (file)
@@ -91,67 +91,68 @@ class ProfilesettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Profile information'));
         $this->hidden('token', common_session_token());
 
-        # too much common patterns here... abstractable?
-
+        // too much common patterns here... abstractable?
         $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->input('nickname', _('Nickname'),
-                     ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
-                     _('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('fullname', _('Full name'),
-                     ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('homepage', _('Homepage'),
-                     ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
-                     _('URL of your homepage, blog, or profile on another site'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->textarea('bio', _('Bio'),
-                        ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
-                        _('Describe yourself and your interests in 140 chars'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('location', _('Location'),
-                     ($this->arg('location')) ? $this->arg('location') : $profile->location,
-                     _('Where you are, like "City, State (or Region), Country"'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('tags', _('Tags'),
-                     ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
-                     _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $language = common_language();
-        $this->dropdown('language', _('Language'),
-                        get_nice_language_list(), _('Preferred language'),
-                        true, $language);
-        $this->elementEnd('li');
-        $timezone = common_timezone();
-        $timezones = array();
-        foreach(DateTimeZone::listIdentifiers() as $k => $v) {
-            $timezones[$v] = $v;
+        if (Event::handle('StartProfileFormData', array($this))) {
+            $this->elementStart('li');
+            $this->input('nickname', _('Nickname'),
+                         ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
+                         _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->input('fullname', _('Full name'),
+                         ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->input('homepage', _('Homepage'),
+                         ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
+                         _('URL of your homepage, blog, or profile on another site'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->textarea('bio', _('Bio'),
+                            ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
+                            _('Describe yourself and your interests in 140 chars'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->input('location', _('Location'),
+                         ($this->arg('location')) ? $this->arg('location') : $profile->location,
+                         _('Where you are, like "City, State (or Region), Country"'));
+            $this->elementEnd('li');
+            Event::handle('EndProfileFormData', array($this));
+            $this->elementStart('li');
+            $this->input('tags', _('Tags'),
+                         ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
+                         _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $language = common_language();
+            $this->dropdown('language', _('Language'),
+                            get_nice_language_list(), _('Preferred language'),
+                            false, $language);
+            $this->elementEnd('li');
+            $timezone = common_timezone();
+            $timezones = array();
+            foreach(DateTimeZone::listIdentifiers() as $k => $v) {
+                $timezones[$v] = $v;
+            }
+            $this->elementStart('li');
+            $this->dropdown('timezone', _('Timezone'),
+                            $timezones, _('What timezone are you normally in?'),
+                            true, $timezone);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->checkbox('autosubscribe',
+                            _('Automatically subscribe to whoever '.
+                              'subscribes to me (best for non-humans)'),
+                            ($this->arg('autosubscribe')) ?
+                            $this->boolean('autosubscribe') : $user->autosubscribe);
+            $this->elementEnd('li');
         }
-        $this->elementStart('li');
-        $this->dropdown('timezone', _('Timezone'),
-                        $timezones, _('What timezone are you normally in?'),
-                        true, $timezone);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('autosubscribe',
-                        _('Automatically subscribe to whoever '.
-                          'subscribes to me (best for non-humans)'),
-                        ($this->arg('autosubscribe')) ?
-                        $this->boolean('autosubscribe') : $user->autosubscribe);
-        $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
 
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
-
     }
 
     /**
@@ -165,158 +166,158 @@ class ProfilesettingsAction extends AccountSettingsAction
 
     function handlePost()
     {
-        # CSRF protection
-
+        // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
             $this->showForm(_('There was a problem with your session token. '.
-                               'Try again, please.'));
+                        'Try again, please.'));
             return;
         }
 
-        $nickname = $this->trimmed('nickname');
-        $fullname = $this->trimmed('fullname');
-        $homepage = $this->trimmed('homepage');
-        $bio = $this->trimmed('bio');
-        $location = $this->trimmed('location');
-        $autosubscribe = $this->boolean('autosubscribe');
-        $language = $this->trimmed('language');
-        $timezone = $this->trimmed('timezone');
-        $tagstring = $this->trimmed('tags');
-
-        # Some validation
-
-        if (!Validate::string($nickname, array('min_length' => 1,
-                                               'max_length' => 64,
-                                               'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-            $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
-            return;
-        } else if (!User::allowed_nickname($nickname)) {
-            $this->showForm(_('Not a valid nickname.'));
-            return;
-        } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
-                   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
-            $this->showForm(_('Homepage is not a valid URL.'));
-            return;
-        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
-            $this->showForm(_('Full name is too long (max 255 chars).'));
-            return;
-        } else if (!is_null($bio) && mb_strlen($bio) > 140) {
-            $this->showForm(_('Bio is too long (max 140 chars).'));
-            return;
-        } else if (!is_null($location) && mb_strlen($location) > 255) {
-            $this->showForm(_('Location is too long (max 255 chars).'));
-            return;
-        }  else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
-            $this->showForm(_('Timezone not selected.'));
-            return;
-        } else if ($this->nicknameExists($nickname)) {
-            $this->showForm(_('Nickname already in use. Try another one.'));
-            return;
-        } else if (!is_null($language) && strlen($language) > 50) {
-            $this->showForm(_('Language is too long (max 50 chars).'));
-            return;
-        }
+        if (Event::handle('StartProfileSaveForm', array($this))) {
+
+            $nickname = $this->trimmed('nickname');
+            $fullname = $this->trimmed('fullname');
+            $homepage = $this->trimmed('homepage');
+            $bio = $this->trimmed('bio');
+            $location = $this->trimmed('location');
+            $autosubscribe = $this->boolean('autosubscribe');
+            $language = $this->trimmed('language');
+            $timezone = $this->trimmed('timezone');
+            $tagstring = $this->trimmed('tags');
+
+            // Some validation
+            if (!Validate::string($nickname, array('min_length' => 1,
+                            'max_length' => 64,
+                            'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
+                $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
+                return;
+            } else if (!User::allowed_nickname($nickname)) {
+                $this->showForm(_('Not a valid nickname.'));
+                return;
+            } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
+                    !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
+                $this->showForm(_('Homepage is not a valid URL.'));
+                return;
+            } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
+                $this->showForm(_('Full name is too long (max 255 chars).'));
+                return;
+            } else if (!is_null($bio) && mb_strlen($bio) > 140) {
+                $this->showForm(_('Bio is too long (max 140 chars).'));
+                return;
+            } else if (!is_null($location) && mb_strlen($location) > 255) {
+                $this->showForm(_('Location is too long (max 255 chars).'));
+                return;
+            }  else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
+                $this->showForm(_('Timezone not selected.'));
+                return;
+            } else if ($this->nicknameExists($nickname)) {
+                $this->showForm(_('Nickname already in use. Try another one.'));
+                return;
+            } else if (!is_null($language) && strlen($language) > 50) {
+                $this->showForm(_('Language is too long (max 50 chars).'));
+                return;
+            }
 
-        if ($tagstring) {
-            $tags = array_map('common_canonical_tag', preg_split('/[\s,]+/', $tagstring));
-        } else {
-            $tags = array();
-        }
+            if ($tagstring) {
+                $tags = array_map('common_canonical_tag', preg_split('/[\s,]+/', $tagstring));
+            } else {
+                $tags = array();
+            }
 
-        foreach ($tags as $tag) {
-            if (!common_valid_profile_tag($tag)) {
-                $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
-                return;
+            foreach ($tags as $tag) {
+                if (!common_valid_profile_tag($tag)) {
+                    $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
+                    return;
+                }
             }
-        }
 
-        $user = common_current_user();
+            $user = common_current_user();
 
-        $user->query('BEGIN');
+            $user->query('BEGIN');
 
-        if ($user->nickname != $nickname ||
-            $user->language != $language ||
-            $user->timezone != $timezone) {
+            if ($user->nickname != $nickname ||
+                    $user->language != $language ||
+                    $user->timezone != $timezone) {
 
-            common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
-                         __FILE__);
-            common_debug('Updating user language from ' . $user->language . ' to ' . $language,
-                         __FILE__);
-            common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone,
-                         __FILE__);
+                common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
+                        __FILE__);
+                common_debug('Updating user language from ' . $user->language . ' to ' . $language,
+                        __FILE__);
+                common_debug('Updating user timezone from ' . $user->timezone . ' to ' . $timezone,
+                        __FILE__);
 
-            $original = clone($user);
+                $original = clone($user);
 
-            $user->nickname = $nickname;
-            $user->language = $language;
-            $user->timezone = $timezone;
+                $user->nickname = $nickname;
+                $user->language = $language;
+                $user->timezone = $timezone;
 
-            $result = $user->updateKeys($original);
+                $result = $user->updateKeys($original);
 
-            if ($result === false) {
-                common_log_db_error($user, 'UPDATE', __FILE__);
-                $this->serverError(_('Couldn\'t update user.'));
-                return;
-            } else {
-                # Re-initialize language environment if it changed
-                common_init_language();
+                if ($result === false) {
+                    common_log_db_error($user, 'UPDATE', __FILE__);
+                    $this->serverError(_('Couldn\'t update user.'));
+                    return;
+                } else {
+                    // Re-initialize language environment if it changed
+                    common_init_language();
+                }
             }
-        }
-
-        # XXX: XOR
 
-        if ($user->autosubscribe ^ $autosubscribe) {
+// XXX: XOR
+            if ($user->autosubscribe ^ $autosubscribe) {
 
-            $original = clone($user);
+                $original = clone($user);
 
-            $user->autosubscribe = $autosubscribe;
+                $user->autosubscribe = $autosubscribe;
 
-            $result = $user->update($original);
+                $result = $user->update($original);
 
-            if ($result === false) {
-                common_log_db_error($user, 'UPDATE', __FILE__);
-                $this->serverError(_('Couldn\'t update user for autosubscribe.'));
-                return;
+                if ($result === false) {
+                    common_log_db_error($user, 'UPDATE', __FILE__);
+                    $this->serverError(_('Couldn\'t update user for autosubscribe.'));
+                    return;
+                }
             }
-        }
-
-        $profile = $user->getProfile();
 
-        $orig_profile = clone($profile);
+            $profile = $user->getProfile();
 
-        $profile->nickname = $user->nickname;
-        $profile->fullname = $fullname;
-        $profile->homepage = $homepage;
-        $profile->bio = $bio;
-        $profile->location = $location;
-        $profile->profileurl = common_profile_url($nickname);
+            $orig_profile = clone($profile);
 
-        common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
-        common_debug('New profile: ' . common_log_objstring($profile), __FILE__);
+            $profile->nickname = $user->nickname;
+            $profile->fullname = $fullname;
+            $profile->homepage = $homepage;
+            $profile->bio = $bio;
+            $profile->location = $location;
+            $profile->profileurl = common_profile_url($nickname);
 
-        $result = $profile->update($orig_profile);
+            common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
+            common_debug('New profile: ' . common_log_objstring($profile), __FILE__);
 
-        if (!$result) {
-            common_log_db_error($profile, 'UPDATE', __FILE__);
-            $this->serverError(_('Couldn\'t save profile.'));
-            return;
-        }
+            $result = $profile->update($orig_profile);
 
-        # Set the user tags
+            if (!$result) {
+                common_log_db_error($profile, 'UPDATE', __FILE__);
+                $this->serverError(_('Couldn\'t save profile.'));
+                return;
+            }
 
-        $result = $user->setSelfTags($tags);
+            // Set the user tags
+            $result = $user->setSelfTags($tags);
 
-        if (!$result) {
-            $this->serverError(_('Couldn\'t save tags.'));
-            return;
-        }
+            if (!$result) {
+                $this->serverError(_('Couldn\'t save tags.'));
+                return;
+            }
 
-        $user->query('COMMIT');
+            $user->query('COMMIT');
+            Event::handle('EndProfileSaveForm', array($this));
+            common_broadcast_profile($profile);
 
-        common_broadcast_profile($profile);
+            $this->showForm(_('Settings saved.'), true);
 
-        $this->showForm(_('Settings saved.'), true);
+        }
     }
 
     function nicknameExists($nickname)
index 5d7a8ce690d5fa88655f2a6c0f5fa2596c6c478e..ab49ad3fdc27829f38268af6267e4142b0630c31 100644 (file)
@@ -108,107 +108,109 @@ class RegisterAction extends Action
 
     function tryRegister()
     {
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->showForm(_('There was a problem with your session token. '.
-                              'Try again, please.'));
-            return;
-        }
-
-        $nickname = $this->trimmed('nickname');
-        $email    = $this->trimmed('email');
-        $fullname = $this->trimmed('fullname');
-        $homepage = $this->trimmed('homepage');
-        $bio      = $this->trimmed('bio');
-        $location = $this->trimmed('location');
-
-        // We don't trim these... whitespace is OK in a password!
-
-        $password = $this->arg('password');
-        $confirm  = $this->arg('confirm');
+        if (Event::handle('StartRegistrationTry', array($this))) {
+            $token = $this->trimmed('token');
+            if (!$token || $token != common_session_token()) {
+                $this->showForm(_('There was a problem with your session token. '.
+                            'Try again, please.'));
+                return;
+            }
 
-        // invitation code, if any
+            $nickname = $this->trimmed('nickname');
+            $email    = $this->trimmed('email');
+            $fullname = $this->trimmed('fullname');
+            $homepage = $this->trimmed('homepage');
+            $bio      = $this->trimmed('bio');
+            $location = $this->trimmed('location');
 
-        $code = $this->trimmed('code');
+            // We don't trim these... whitespace is OK in a password!
+            $password = $this->arg('password');
+            $confirm  = $this->arg('confirm');
 
-        if ($code) {
-            $invite = Invitation::staticGet($code);
-        }
+            // invitation code, if any
+            $code = $this->trimmed('code');
 
-        if (common_config('site', 'inviteonly') && !($code && $invite)) {
-            $this->clientError(_('Sorry, only invited people can register.'));
-            return;
-        }
+            if ($code) {
+                $invite = Invitation::staticGet($code);
+            }
 
-        // Input scrubbing
-
-        $nickname = common_canonical_nickname($nickname);
-        $email    = common_canonical_email($email);
-
-        if (!$this->boolean('license')) {
-            $this->showForm(_('You can\'t register if you don\'t '.
-                              'agree to the license.'));
-        } else if ($email && !Validate::email($email, true)) {
-            $this->showForm(_('Not a valid email address.'));
-        } else if (!Validate::string($nickname, array('min_length' => 1,
-                                                      'max_length' => 64,
-                                                      'format' => NICKNAME_FMT))) {
-            $this->showForm(_('Nickname must have only lowercase letters '.
-                              'and numbers and no spaces.'));
-        } else if ($this->nicknameExists($nickname)) {
-            $this->showForm(_('Nickname already in use. Try another one.'));
-        } else if (!User::allowed_nickname($nickname)) {
-            $this->showForm(_('Not a valid nickname.'));
-        } else if ($this->emailExists($email)) {
-            $this->showForm(_('Email address already exists.'));
-        } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
-                   !Validate::uri($homepage,
-                                  array('allowed_schemes' =>
-                                        array('http', 'https')))) {
-            $this->showForm(_('Homepage is not a valid URL.'));
-            return;
-        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
-            $this->showForm(_('Full name is too long (max 255 chars).'));
-            return;
-        } else if (!is_null($bio) && mb_strlen($bio) > 140) {
-            $this->showForm(_('Bio is too long (max 140 chars).'));
-            return;
-        } else if (!is_null($location) && mb_strlen($location) > 255) {
-            $this->showForm(_('Location is too long (max 255 chars).'));
-            return;
-        } else if (strlen($password) < 6) {
-            $this->showForm(_('Password must be 6 or more characters.'));
-            return;
-        } else if ($password != $confirm) {
-            $this->showForm(_('Passwords don\'t match.'));
-        } else if ($user = User::register(array('nickname' => $nickname,
-                                                'password' => $password,
-                                                'email' => $email,
-                                                'fullname' => $fullname,
-                                                'homepage' => $homepage,
-                                                'bio' => $bio,
-                                                'location' => $location,
-                                                'code' => $code))) {
-            if (!$user) {
-                $this->showForm(_('Invalid username or password.'));
+            if (common_config('site', 'inviteonly') && !($code && $invite)) {
+                $this->clientError(_('Sorry, only invited people can register.'));
                 return;
             }
-            // success!
-            if (!common_set_user($user)) {
-                $this->serverError(_('Error setting user.'));
+
+            // Input scrubbing
+            $nickname = common_canonical_nickname($nickname);
+            $email    = common_canonical_email($email);
+
+            if (!$this->boolean('license')) {
+                $this->showForm(_('You can\'t register if you don\'t '.
+                            'agree to the license.'));
+            } else if ($email && !Validate::email($email, true)) {
+                $this->showForm(_('Not a valid email address.'));
+            } else if (!Validate::string($nickname, array('min_length' => 1,
+                            'max_length' => 64,
+                            'format' => NICKNAME_FMT))) {
+                $this->showForm(_('Nickname must have only lowercase letters '.
+                            'and numbers and no spaces.'));
+            } else if ($this->nicknameExists($nickname)) {
+                $this->showForm(_('Nickname already in use. Try another one.'));
+            } else if (!User::allowed_nickname($nickname)) {
+                $this->showForm(_('Not a valid nickname.'));
+            } else if ($this->emailExists($email)) {
+                $this->showForm(_('Email address already exists.'));
+            } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
+                    !Validate::uri($homepage,
+                        array('allowed_schemes' =>
+                            array('http', 'https')))) {
+                $this->showForm(_('Homepage is not a valid URL.'));
                 return;
+            } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
+                $this->showForm(_('Full name is too long (max 255 chars).'));
+                return;
+            } else if (!is_null($bio) && mb_strlen($bio) > 140) {
+                $this->showForm(_('Bio is too long (max 140 chars).'));
+                return;
+            } else if (!is_null($location) && mb_strlen($location) > 255) {
+                $this->showForm(_('Location is too long (max 255 chars).'));
+                return;
+            } else if (strlen($password) < 6) {
+                $this->showForm(_('Password must be 6 or more characters.'));
+                return;
+            } else if ($password != $confirm) {
+                $this->showForm(_('Passwords don\'t match.'));
+            } else if ($user = User::register(array('nickname' => $nickname,
+                            'password' => $password,
+                            'email' => $email,
+                            'fullname' => $fullname,
+                            'homepage' => $homepage,
+                            'bio' => $bio,
+                            'location' => $location,
+                            'code' => $code))) {
+                if (!$user) {
+                    $this->showForm(_('Invalid username or password.'));
+                    return;
+                }
+                // success!
+                if (!common_set_user($user)) {
+                    $this->serverError(_('Error setting user.'));
+                    return;
+                }
+                // this is a real login
+                common_real_login(true);
+                if ($this->boolean('rememberme')) {
+                    common_debug('Adding rememberme cookie for ' . $nickname);
+                    common_rememberme($user);
+                }
+
+                Event::handle('EndRegistrationTry', array($this));
+
+                // Re-init language env in case it changed (not yet, but soon)
+                common_init_language();
+                $this->showSuccess();
+            } else {
+                $this->showForm(_('Invalid username or password.'));
             }
-            // this is a real login
-            common_real_login(true);
-            if ($this->boolean('rememberme')) {
-                common_debug('Adding rememberme cookie for ' . $nickname);
-                common_rememberme($user);
-            }
-            // Re-init language env in case it changed (not yet, but soon)
-            common_init_language();
-            $this->showSuccess();
-        } else {
-            $this->showForm(_('Invalid username or password.'));
         }
     }
 
@@ -250,7 +252,9 @@ class RegisterAction extends Action
 
     // overrrided to add entry-title class
     function showPageTitle() {
-        $this->element('h1', array('class' => 'entry-title'), $this->title());
+        if (Event::handle('StartShowPageTitle', array($this))) {
+            $this->element('h1', array('class' => 'entry-title'), $this->title());
+        }
     }
 
     // overrided to add hentry, and content-inner class
@@ -351,9 +355,9 @@ class RegisterAction extends Action
         }
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_register',
-                                          'class' => 'form_settings',
-                                          'action' => common_local_url('register')));
+                    'id' => 'form_register',
+                    'class' => 'form_settings',
+                    'action' => common_local_url('register')));
         $this->elementStart('fieldset');
         $this->element('legend', null, 'Account settings');
         $this->hidden('token', common_session_token());
@@ -363,77 +367,80 @@ class RegisterAction extends Action
         }
 
         $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
-                     _('1-64 lowercase letters or numbers, '.
-                       'no punctuation or spaces. Required.'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('password', _('Password'),
-                        _('6 or more characters. Required.'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('confirm', _('Confirm'),
-                        _('Same as password above. Required.'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        if ($invite && $invite->address_type == 'email') {
-            $this->input('email', _('Email'), $invite->address,
-                         _('Used only for updates, announcements, '.
-                           'and password recovery'));
-        } else {
-            $this->input('email', _('Email'), $this->trimmed('email'),
-                         _('Used only for updates, announcements, '.
-                           'and password recovery'));
-        }
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('fullname', _('Full name'),
-                     $this->trimmed('fullname'),
-                     _('Longer name, preferably your "real" name'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('homepage', _('Homepage'),
-                     $this->trimmed('homepage'),
-                     _('URL of your homepage, blog, '.
-                       'or profile on another site'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->textarea('bio', _('Bio'),
-                        $this->trimmed('bio'),
-                        _('Describe yourself and your '.
-                          'interests in 140 chars'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('location', _('Location'),
-                     $this->trimmed('location'),
-                     _('Where you are, like "City, '.
-                       'State (or Region), Country"'));
-        $this->elementEnd('li');
-        $this->elementStart('li', array('id' => 'settings_rememberme'));
-        $this->checkbox('rememberme', _('Remember me'),
-                        $this->boolean('rememberme'),
-                        _('Automatically login in the future; '.
-                          'not for shared computers!'));
-        $this->elementEnd('li');
-        $attrs = array('type' => 'checkbox',
-                       'id' => 'license',
-                       'class' => 'checkbox',
-                       'name' => 'license',
-                       'value' => 'true');
-        if ($this->boolean('license')) {
-            $attrs['checked'] = 'checked';
+        if (Event::handle('StartRegistrationFormData', array($this))) {
+            $this->elementStart('li');
+            $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
+                    _('1-64 lowercase letters or numbers, '.
+                        'no punctuation or spaces. Required.'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->password('password', _('Password'),
+                    _('6 or more characters. Required.'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->password('confirm', _('Confirm'),
+                    _('Same as password above. Required.'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            if ($invite && $invite->address_type == 'email') {
+                $this->input('email', _('Email'), $invite->address,
+                        _('Used only for updates, announcements, '.
+                            'and password recovery'));
+            } else {
+                $this->input('email', _('Email'), $this->trimmed('email'),
+                        _('Used only for updates, announcements, '.
+                            'and password recovery'));
+            }
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->input('fullname', _('Full name'),
+                    $this->trimmed('fullname'),
+                    _('Longer name, preferably your "real" name'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->input('homepage', _('Homepage'),
+                    $this->trimmed('homepage'),
+                    _('URL of your homepage, blog, '.
+                        'or profile on another site'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->textarea('bio', _('Bio'),
+                    $this->trimmed('bio'),
+                    _('Describe yourself and your '.
+                        'interests in 140 chars'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->input('location', _('Location'),
+                    $this->trimmed('location'),
+                    _('Where you are, like "City, '.
+                        'State (or Region), Country"'));
+            $this->elementEnd('li');
+            Event::handle('EndRegistrationFormData', array($this));
+            $this->elementStart('li', array('id' => 'settings_rememberme'));
+            $this->checkbox('rememberme', _('Remember me'),
+                    $this->boolean('rememberme'),
+                    _('Automatically login in the future; '.
+                        'not for shared computers!'));
+            $this->elementEnd('li');
+            $attrs = array('type' => 'checkbox',
+                    'id' => 'license',
+                    'class' => 'checkbox',
+                    'name' => 'license',
+                    'value' => 'true');
+            if ($this->boolean('license')) {
+                $attrs['checked'] = 'checked';
+            }
+            $this->elementStart('li');
+            $this->element('input', $attrs);
+            $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
+            $this->text(_('My text and files are available under '));
+            $this->element('a', array('href' => common_config('license', 'url')),
+                    common_config('license', 'title'), _("Creative Commons Attribution 3.0"));
+            $this->text(_(' except this private data: password, '.
+                        'email address, IM address, and phone number.'));
+            $this->elementEnd('label');
+            $this->elementEnd('li');
         }
-        $this->elementStart('li');
-        $this->element('input', $attrs);
-        $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
-        $this->text(_('My text and files are available under '));
-        $this->element('a', array('href' => common_config('license', 'url')),
-                       common_config('license', 'title'), _("Creative Commons Attribution 3.0"));
-        $this->text(_(' except this private data: password, '.
-                      'email address, IM address, and phone number.'));
-        $this->elementEnd('label');
-        $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Register'));
         $this->elementEnd('fieldset');
@@ -515,3 +522,4 @@ class RegisterAction extends Action
         $nav->show();
     }
 }
+