replace all tabs with four spaces

The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz

1 files changed, 237 insertions, 237 deletions

diff --git a/actions/register.php b/actions/register.php
index a22ffca28..011aa3f09 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -21,242 +21,242 @@ if (!defined('LACONICA')) { exit(1); }
 
 class RegisterAction extends Action {
 
-	function handle($args) {
-		parent::handle($args);
-
-		if (common_config('site', 'closed')) {
-			common_user_error(_('Registration not allowed.'));
-		} else if (common_logged_in()) {
-			common_user_error(_('Already logged in.'));
-		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$this->try_register();
-		} else {
-			$this->show_form();
-		}
-	}
-
-	function try_register() {
-
-		$token = $this->trimmed('token');
-		if (!$token || $token != common_session_token()) {
-			$this->show_form(_('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');
-
-		# invitation code, if any
-
-		$code = $this->trimmed('code');
-
-		if ($code) {
-			$invite = Invitation::staticGet($code);
-		}
-
-		if (common_config('site', 'inviteonly') && !($code && $invite)) {
-			$this->client_error(_('Sorry, only invited people can register.'));
-			return;
-		}
-
-		# Input scrubbing
-
-		$nickname = common_canonical_nickname($nickname);
-		$email = common_canonical_email($email);
-
-		if (!$this->boolean('license')) {
-			$this->show_form(_('You can\'t register if you don\'t agree to the license.'));
-		} else if ($email && !Validate::email($email, true)) {
-			$this->show_form(_('Not a valid email address.'));
-		} else if (!Validate::string($nickname, array('min_length' => 1,
-													  'max_length' => 64,
-													  'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-			$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
-		} else if ($this->nickname_exists($nickname)) {
-			$this->show_form(_('Nickname already in use. Try another one.'));
-		} else if (!User::allowed_nickname($nickname)) {
-			$this->show_form(_('Not a valid nickname.'));
-		} else if ($this->email_exists($email)) {
-			$this->show_form(_('Email address already exists.'));
-		} else if (!is_null($homepage) && (strlen($homepage) > 0) &&
-				   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
-			$this->show_form(_('Homepage is not a valid URL.'));
-			return;
-		} else if (!is_null($fullname) && strlen($fullname) > 255) {
-			$this->show_form(_('Full name is too long (max 255 chars).'));
-			return;
-		} else if (!is_null($bio) && strlen($bio) > 140) {
-			$this->show_form(_('Bio is too long (max 140 chars).'));
-			return;
-		} else if (!is_null($location) && strlen($location) > 255) {
-			$this->show_form(_('Location is too long (max 255 chars).'));
-			return;
-		} else if (strlen($password) < 6) {
-			$this->show_form(_('Password must be 6 or more characters.'));
-			return;
-		} else if ($password != $confirm) {
-			$this->show_form(_('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->show_form(_('Invalid username or password.'));
-				return;
-			}
-			# success!
-			if (!common_set_user($user)) {
-				common_server_error(_('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);
-			}
-			# Re-init language env in case it changed (not yet, but soon)
-			common_init_language();
-			$this->show_success();
-		} else {
-			$this->show_form(_('Invalid username or password.'));
-		}
-	}
-
-	# checks if *CANONICAL* nickname exists
-
-	function nickname_exists($nickname) {
-		$user = User::staticGet('nickname', $nickname);
-		return ($user !== false);
-	}
-
-	# checks if *CANONICAL* email exists
-
-	function email_exists($email) {
-		$email = common_canonical_email($email);
-		if (!$email || strlen($email) == 0) {
-			return false;
-		}
-		$user = User::staticGet('email', $email);
-		return ($user !== false);
-	}
-
-	function show_top($error=NULL) {
-		if ($error) {
-			common_element('p', 'error', $error);
-		} else {
-			$instr = common_markup_to_html(_('With this form you can create a new account. ' .
-											 'You can then post notices and link up to friends and colleagues. '.
-											 '(Have an [OpenID](http://openid.net/)? ' .
-											 'Try our [OpenID registration](%%action.openidlogin%%)!)'));
-
-			common_element_start('div', 'instructions');
-			common_raw($instr);
-			common_element_end('div');
-		}
-	}
-
-	function show_form($error=NULL) {
-		global $config;
-
-		$code = $this->trimmed('code');
-
-		if ($code) {
-			$invite = Invitation::staticGet($code);
-		}
-
-		if (common_config('site', 'inviteonly') && !($code && $invite)) {
-			$this->client_error(_('Sorry, only invited people can register.'));
-			return;
-		}
-
-		common_show_header(_('Register'), NULL, $error, array($this, 'show_top'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'login',
-										   'action' => common_local_url('register')));
-
-		common_hidden('token', common_session_token());
-
-		if ($code) {
-			common_hidden('code', $code);
-		}
-
-		common_input('nickname', _('Nickname'), $this->trimmed('nickname'),
-					 _('1-64 lowercase letters or numbers, no punctuation or spaces. Required.'));
-		common_password('password', _('Password'),
-						_('6 or more characters. Required.'));
-		common_password('confirm', _('Confirm'),
-						_('Same as password above. Required.'));
-		if ($invite && $invite->address_type == 'email') {
-			common_input('email', _('Email'), $invite->address,
-					 _('Used only for updates, announcements, and password recovery'));
-		} else {
-			common_input('email', _('Email'), $this->trimmed('email'),
-						 _('Used only for updates, announcements, and password recovery'));
-		}
-		common_input('fullname', _('Full name'),
-					 $this->trimmed('fullname'),
-					  _('Longer name, preferably your "real" name'));
-		common_input('homepage', _('Homepage'),
-					 $this->trimmed('homepage'),
-					 _('URL of your homepage, blog, or profile on another site'));
-		common_textarea('bio', _('Bio'),
-						$this->trimmed('bio'),
-						 _('Describe yourself and your interests in 140 chars'));
-		common_input('location', _('Location'),
-					 $this->trimmed('location'),
-					 _('Where you are, like "City, State (or Region), Country"'));
-		common_checkbox('rememberme', _('Remember me'),
-						$this->boolean('rememberme'),
-		                _('Automatically login in the future; not for shared computers!'));
-		common_element_start('p');
-		$attrs = array('type' => 'checkbox',
-					   'id' => 'license',
-					   'name' => 'license',
-					   'value' => 'true');
-		if ($this->boolean('license')) {
-			$attrs['checked'] = 'checked';
-		}
-		common_element('input', $attrs);
-	    common_text(_('My text and files are available under '));
-		common_element('a', array('href' => $config['license']['url']),
-					   $config['license']['title']);
-		common_text(_(' except this private data: password, email address, IM address, phone number.'));
-		common_element_end('p');
-		common_submit('submit', _('Register'));
-		common_element_end('form');
-		common_show_footer();
-	}
-
-	function show_success() {
-		$nickname = $this->arg('nickname');
-		common_show_header(_('Registration successful'));
-		common_element_start('div', 'success');
-		$instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...'. "\n\n" .
-						   '* Go to [your profile](%s) and post your first message.' .  "\n" .
-						   '* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send notices through instant messages.' . "\n" .
-						   '* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that share your interests. ' . "\n" .
-						   '* Update your [profile settings](%%%%action.profilesettings%%%%) to tell others more about you. ' . "\n" .
-						   '* Read over the [online docs](%%%%doc.help%%%%) for features you may have missed. ' . "\n\n" .
-						   'Thanks for signing up and we hope you enjoy using this service.'),
-						 $nickname, common_local_url('showstream', array('nickname' => $nickname)));
-		common_raw(common_markup_to_html($instr));
-		$have_email = $this->trimmed('email');
-		if ($have_email) {
-			$emailinstr = _('(You should receive a message by email momentarily, with ' .
-							'instructions on how to confirm your email address.)');
-			common_raw(common_markup_to_html($emailinstr));
-		}
-		common_element_end('div');
-		common_show_footer();
-	}
+    function handle($args) {
+        parent::handle($args);
+
+        if (common_config('site', 'closed')) {
+            common_user_error(_('Registration not allowed.'));
+        } else if (common_logged_in()) {
+            common_user_error(_('Already logged in.'));
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->try_register();
+        } else {
+            $this->show_form();
+        }
+    }
+
+    function try_register() {
+
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->show_form(_('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');
+
+        # invitation code, if any
+
+        $code = $this->trimmed('code');
+
+        if ($code) {
+            $invite = Invitation::staticGet($code);
+        }
+
+        if (common_config('site', 'inviteonly') && !($code && $invite)) {
+            $this->client_error(_('Sorry, only invited people can register.'));
+            return;
+        }
+
+        # Input scrubbing
+
+        $nickname = common_canonical_nickname($nickname);
+        $email = common_canonical_email($email);
+
+        if (!$this->boolean('license')) {
+            $this->show_form(_('You can\'t register if you don\'t agree to the license.'));
+        } else if ($email && !Validate::email($email, true)) {
+            $this->show_form(_('Not a valid email address.'));
+        } else if (!Validate::string($nickname, array('min_length' => 1,
+                                                      'max_length' => 64,
+                                                      'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
+            $this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
+        } else if ($this->nickname_exists($nickname)) {
+            $this->show_form(_('Nickname already in use. Try another one.'));
+        } else if (!User::allowed_nickname($nickname)) {
+            $this->show_form(_('Not a valid nickname.'));
+        } else if ($this->email_exists($email)) {
+            $this->show_form(_('Email address already exists.'));
+        } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
+                   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
+            $this->show_form(_('Homepage is not a valid URL.'));
+            return;
+        } else if (!is_null($fullname) && strlen($fullname) > 255) {
+            $this->show_form(_('Full name is too long (max 255 chars).'));
+            return;
+        } else if (!is_null($bio) && strlen($bio) > 140) {
+            $this->show_form(_('Bio is too long (max 140 chars).'));
+            return;
+        } else if (!is_null($location) && strlen($location) > 255) {
+            $this->show_form(_('Location is too long (max 255 chars).'));
+            return;
+        } else if (strlen($password) < 6) {
+            $this->show_form(_('Password must be 6 or more characters.'));
+            return;
+        } else if ($password != $confirm) {
+            $this->show_form(_('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->show_form(_('Invalid username or password.'));
+                return;
+            }
+            # success!
+            if (!common_set_user($user)) {
+                common_server_error(_('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);
+            }
+            # Re-init language env in case it changed (not yet, but soon)
+            common_init_language();
+            $this->show_success();
+        } else {
+            $this->show_form(_('Invalid username or password.'));
+        }
+    }
+
+    # checks if *CANONICAL* nickname exists
+
+    function nickname_exists($nickname) {
+        $user = User::staticGet('nickname', $nickname);
+        return ($user !== false);
+    }
+
+    # checks if *CANONICAL* email exists
+
+    function email_exists($email) {
+        $email = common_canonical_email($email);
+        if (!$email || strlen($email) == 0) {
+            return false;
+        }
+        $user = User::staticGet('email', $email);
+        return ($user !== false);
+    }
+
+    function show_top($error=NULL) {
+        if ($error) {
+            common_element('p', 'error', $error);
+        } else {
+            $instr = common_markup_to_html(_('With this form you can create a new account. ' .
+                                             'You can then post notices and link up to friends and colleagues. '.
+                                             '(Have an [OpenID](http://openid.net/)? ' .
+                                             'Try our [OpenID registration](%%action.openidlogin%%)!)'));
+
+            common_element_start('div', 'instructions');
+            common_raw($instr);
+            common_element_end('div');
+        }
+    }
+
+    function show_form($error=NULL) {
+        global $config;
+
+        $code = $this->trimmed('code');
+
+        if ($code) {
+            $invite = Invitation::staticGet($code);
+        }
+
+        if (common_config('site', 'inviteonly') && !($code && $invite)) {
+            $this->client_error(_('Sorry, only invited people can register.'));
+            return;
+        }
+
+        common_show_header(_('Register'), NULL, $error, array($this, 'show_top'));
+        common_element_start('form', array('method' => 'post',
+                                           'id' => 'login',
+                                           'action' => common_local_url('register')));
+
+        common_hidden('token', common_session_token());
+
+        if ($code) {
+            common_hidden('code', $code);
+        }
+
+        common_input('nickname', _('Nickname'), $this->trimmed('nickname'),
+                     _('1-64 lowercase letters or numbers, no punctuation or spaces. Required.'));
+        common_password('password', _('Password'),
+                        _('6 or more characters. Required.'));
+        common_password('confirm', _('Confirm'),
+                        _('Same as password above. Required.'));
+        if ($invite && $invite->address_type == 'email') {
+            common_input('email', _('Email'), $invite->address,
+                     _('Used only for updates, announcements, and password recovery'));
+        } else {
+            common_input('email', _('Email'), $this->trimmed('email'),
+                         _('Used only for updates, announcements, and password recovery'));
+        }
+        common_input('fullname', _('Full name'),
+                     $this->trimmed('fullname'),
+                      _('Longer name, preferably your "real" name'));
+        common_input('homepage', _('Homepage'),
+                     $this->trimmed('homepage'),
+                     _('URL of your homepage, blog, or profile on another site'));
+        common_textarea('bio', _('Bio'),
+                        $this->trimmed('bio'),
+                         _('Describe yourself and your interests in 140 chars'));
+        common_input('location', _('Location'),
+                     $this->trimmed('location'),
+                     _('Where you are, like "City, State (or Region), Country"'));
+        common_checkbox('rememberme', _('Remember me'),
+                        $this->boolean('rememberme'),
+                        _('Automatically login in the future; not for shared computers!'));
+        common_element_start('p');
+        $attrs = array('type' => 'checkbox',
+                       'id' => 'license',
+                       'name' => 'license',
+                       'value' => 'true');
+        if ($this->boolean('license')) {
+            $attrs['checked'] = 'checked';
+        }
+        common_element('input', $attrs);
+        common_text(_('My text and files are available under '));
+        common_element('a', array('href' => $config['license']['url']),
+                       $config['license']['title']);
+        common_text(_(' except this private data: password, email address, IM address, phone number.'));
+        common_element_end('p');
+        common_submit('submit', _('Register'));
+        common_element_end('form');
+        common_show_footer();
+    }
+
+    function show_success() {
+        $nickname = $this->arg('nickname');
+        common_show_header(_('Registration successful'));
+        common_element_start('div', 'success');
+        $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...'. "\n\n" .
+                           '* Go to [your profile](%s) and post your first message.' .  "\n" .
+                           '* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send notices through instant messages.' . "\n" .
+                           '* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that share your interests. ' . "\n" .
+                           '* Update your [profile settings](%%%%action.profilesettings%%%%) to tell others more about you. ' . "\n" .
+                           '* Read over the [online docs](%%%%doc.help%%%%) for features you may have missed. ' . "\n\n" .
+                           'Thanks for signing up and we hope you enjoy using this service.'),
+                         $nickname, common_local_url('showstream', array('nickname' => $nickname)));
+        common_raw(common_markup_to_html($instr));
+        $have_email = $this->trimmed('email');
+        if ($have_email) {
+            $emailinstr = _('(You should receive a message by email momentarily, with ' .
+                            'instructions on how to confirm your email address.)');
+            common_raw(common_markup_to_html($emailinstr));
+        }
+        common_element_end('div');
+        common_show_footer();
+    }
 
 }