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, 234 insertions, 234 deletions

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 0aa7631dc..d0c47f7fd 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -24,247 +24,247 @@ require_once(INSTALLDIR.'/lib/jabber.php');
 
 class ImsettingsAction extends SettingsAction {
 
-	function get_instructions() {
-		return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
-	}
-
-	function show_form($msg=NULL, $success=false) {
-		$user = common_current_user();
-		$this->form_header(_('IM Settings'), $msg, $success);
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'imsettings',
-										   'action' =>
-										   common_local_url('imsettings')));
-		common_hidden('token', common_session_token());
-
-		common_element('h2', NULL, _('Address'));
-
-		if ($user->jabber) {
-			common_element_start('p');
-			common_element('span', 'address confirmed', $user->jabber);
-			common_element('span', 'input_instructions',
-			               _('Current confirmed Jabber/GTalk address.'));
-			common_hidden('jabber', $user->jabber);
-			common_element_end('p');
-			common_submit('remove', _('Remove'));
-		} else {
-			$confirm = $this->get_confirmation();
-			if ($confirm) {
-				common_element_start('p');
-				common_element('span', 'address unconfirmed', $confirm->address);
-				common_element('span', 'input_instructions',
-			  	              sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
-				common_hidden('jabber', $confirm->address);
-				common_element_end('p');
-				common_submit('cancel', _('Cancel'));
-			} else {
-				common_input('jabber', _('IM Address'),
-						 	($this->arg('jabber')) ? $this->arg('jabber') : NULL,
-						 sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
-				common_submit('add', _('Add'));
-			}
-		}
-
-		common_element('h2', NULL, _('Preferences'));
-
-		common_checkbox('jabbernotify',
-		                _('Send me notices through Jabber/GTalk.'),
-		                $user->jabbernotify);
-		common_checkbox('updatefrompresence',
-		                _('Post a notice when my Jabber/GTalk status changes.'),
-		                $user->updatefrompresence);
-		common_checkbox('jabberreplies',
-		                _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
-		                $user->jabberreplies);
-		common_checkbox('jabbermicroid',
-		                _('Publish a MicroID for my Jabber/GTalk address.'),
-		                $user->jabbermicroid);
-		common_submit('save', _('Save'));
-
-		common_element_end('form');
-		common_show_footer();
-	}
-
-	function get_confirmation() {
-		$user = common_current_user();
-		$confirm = new Confirm_address();
-		$confirm->user_id = $user->id;
-		$confirm->address_type = 'jabber';
-		if ($confirm->find(TRUE)) {
-			return $confirm;
-		} else {
-			return NULL;
-		}
-	}
-
-	function handle_post() {
-
-		# CSRF protection
-		$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;
-		}
-
-		if ($this->arg('save')) {
-			$this->save_preferences();
-		} else if ($this->arg('add')) {
-			$this->add_address();
-		} else if ($this->arg('cancel')) {
-			$this->cancel_confirmation();
-		} else if ($this->arg('remove')) {
-			$this->remove_address();
-		} else {
-			$this->show_form(_('Unexpected form submission.'));
-		}
-	}
-
-	function save_preferences() {
-
-		$jabbernotify = $this->boolean('jabbernotify');
-		$updatefrompresence = $this->boolean('updatefrompresence');
-		$jabberreplies = $this->boolean('jabberreplies');
-		$jabbermicroid = $this->boolean('jabbermicroid');
-
-		$user = common_current_user();
-
-		assert(!is_null($user)); # should already be checked
-
-		$user->query('BEGIN');
-
-		$original = clone($user);
-
-		$user->jabbernotify = $jabbernotify;
-		$user->updatefrompresence = $updatefrompresence;
-		$user->jabberreplies = $jabberreplies;
-		$user->jabbermicroid = $jabbermicroid;
-
-		$result = $user->update($original);
-
-		if ($result === FALSE) {
-			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_('Couldn\'t update user.'));
-			return;
-		}
-
-		$user->query('COMMIT');
-
-		$this->show_form(_('Preferences saved.'), true);
-	}
-
-	function add_address() {
-
-		$user = common_current_user();
-
-		$jabber = $this->trimmed('jabber');
-
-		# Some validation
-
-		if (!$jabber) {
-			$this->show_form(_('No Jabber ID.'));
-			return;
-		}
-
-		$jabber = jabber_normalize_jid($jabber);
-
-		if (!$jabber) {
-		    $this->show_form(_('Cannot normalize that Jabber ID'));
-		    return;
-		}
-		if (!jabber_valid_base_jid($jabber)) {
-		    $this->show_form(_('Not a valid Jabber ID'));
-		    return;
-		} else if ($user->jabber == $jabber) {
-		    $this->show_form(_('That is already your Jabber ID.'));
-		    return;
-		} else if ($this->jabber_exists($jabber)) {
-		    $this->show_form(_('Jabber ID already belongs to another user.'));
-		    return;
-		}
-
-  		$confirm = new Confirm_address();
-   		$confirm->address = $jabber;
-   		$confirm->address_type = 'jabber';
-   		$confirm->user_id = $user->id;
-   		$confirm->code = common_confirmation_code(64);
-
-		$result = $confirm->insert();
-
-		if ($result === FALSE) {
-			common_log_db_error($confirm, 'INSERT', __FILE__);
-			common_server_error(_('Couldn\'t insert confirmation code.'));
-			return;
-		}
-
-		if (!common_config('queue', 'enabled')) {
-			jabber_confirm_address($confirm->code,
-								   $user->nickname,
-								   $jabber);
-		}
-
-		$msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
-
-		$this->show_form($msg, TRUE);
-	}
-
-	function cancel_confirmation() {
-		$jabber = $this->arg('jabber');
-		$confirm = $this->get_confirmation();
-		if (!$confirm) {
-			$this->show_form(_('No pending confirmation to cancel.'));
-			return;
-		}
-		if ($confirm->address != $jabber) {
-			$this->show_form(_('That is the wrong IM address.'));
-			return;
-		}
+    function get_instructions() {
+        return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
+    }
+
+    function show_form($msg=NULL, $success=false) {
+        $user = common_current_user();
+        $this->form_header(_('IM Settings'), $msg, $success);
+        common_element_start('form', array('method' => 'post',
+                                           'id' => 'imsettings',
+                                           'action' =>
+                                           common_local_url('imsettings')));
+        common_hidden('token', common_session_token());
+
+        common_element('h2', NULL, _('Address'));
+
+        if ($user->jabber) {
+            common_element_start('p');
+            common_element('span', 'address confirmed', $user->jabber);
+            common_element('span', 'input_instructions',
+                           _('Current confirmed Jabber/GTalk address.'));
+            common_hidden('jabber', $user->jabber);
+            common_element_end('p');
+            common_submit('remove', _('Remove'));
+        } else {
+            $confirm = $this->get_confirmation();
+            if ($confirm) {
+                common_element_start('p');
+                common_element('span', 'address unconfirmed', $confirm->address);
+                common_element('span', 'input_instructions',
+                                sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
+                common_hidden('jabber', $confirm->address);
+                common_element_end('p');
+                common_submit('cancel', _('Cancel'));
+            } else {
+                common_input('jabber', _('IM Address'),
+                             ($this->arg('jabber')) ? $this->arg('jabber') : NULL,
+                         sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
+                common_submit('add', _('Add'));
+            }
+        }
+
+        common_element('h2', NULL, _('Preferences'));
+
+        common_checkbox('jabbernotify',
+                        _('Send me notices through Jabber/GTalk.'),
+                        $user->jabbernotify);
+        common_checkbox('updatefrompresence',
+                        _('Post a notice when my Jabber/GTalk status changes.'),
+                        $user->updatefrompresence);
+        common_checkbox('jabberreplies',
+                        _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
+                        $user->jabberreplies);
+        common_checkbox('jabbermicroid',
+                        _('Publish a MicroID for my Jabber/GTalk address.'),
+                        $user->jabbermicroid);
+        common_submit('save', _('Save'));
+
+        common_element_end('form');
+        common_show_footer();
+    }
+
+    function get_confirmation() {
+        $user = common_current_user();
+        $confirm = new Confirm_address();
+        $confirm->user_id = $user->id;
+        $confirm->address_type = 'jabber';
+        if ($confirm->find(TRUE)) {
+            return $confirm;
+        } else {
+            return NULL;
+        }
+    }
+
+    function handle_post() {
+
+        # CSRF protection
+        $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;
+        }
+
+        if ($this->arg('save')) {
+            $this->save_preferences();
+        } else if ($this->arg('add')) {
+            $this->add_address();
+        } else if ($this->arg('cancel')) {
+            $this->cancel_confirmation();
+        } else if ($this->arg('remove')) {
+            $this->remove_address();
+        } else {
+            $this->show_form(_('Unexpected form submission.'));
+        }
+    }
+
+    function save_preferences() {
+
+        $jabbernotify = $this->boolean('jabbernotify');
+        $updatefrompresence = $this->boolean('updatefrompresence');
+        $jabberreplies = $this->boolean('jabberreplies');
+        $jabbermicroid = $this->boolean('jabbermicroid');
+
+        $user = common_current_user();
+
+        assert(!is_null($user)); # should already be checked
+
+        $user->query('BEGIN');
+
+        $original = clone($user);
+
+        $user->jabbernotify = $jabbernotify;
+        $user->updatefrompresence = $updatefrompresence;
+        $user->jabberreplies = $jabberreplies;
+        $user->jabbermicroid = $jabbermicroid;
+
+        $result = $user->update($original);
+
+        if ($result === FALSE) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            common_server_error(_('Couldn\'t update user.'));
+            return;
+        }
+
+        $user->query('COMMIT');
+
+        $this->show_form(_('Preferences saved.'), true);
+    }
+
+    function add_address() {
+
+        $user = common_current_user();
+
+        $jabber = $this->trimmed('jabber');
+
+        # Some validation
+
+        if (!$jabber) {
+            $this->show_form(_('No Jabber ID.'));
+            return;
+        }
+
+        $jabber = jabber_normalize_jid($jabber);
+
+        if (!$jabber) {
+            $this->show_form(_('Cannot normalize that Jabber ID'));
+            return;
+        }
+        if (!jabber_valid_base_jid($jabber)) {
+            $this->show_form(_('Not a valid Jabber ID'));
+            return;
+        } else if ($user->jabber == $jabber) {
+            $this->show_form(_('That is already your Jabber ID.'));
+            return;
+        } else if ($this->jabber_exists($jabber)) {
+            $this->show_form(_('Jabber ID already belongs to another user.'));
+            return;
+        }
+
+          $confirm = new Confirm_address();
+           $confirm->address = $jabber;
+           $confirm->address_type = 'jabber';
+           $confirm->user_id = $user->id;
+           $confirm->code = common_confirmation_code(64);
+
+        $result = $confirm->insert();
+
+        if ($result === FALSE) {
+            common_log_db_error($confirm, 'INSERT', __FILE__);
+            common_server_error(_('Couldn\'t insert confirmation code.'));
+            return;
+        }
+
+        if (!common_config('queue', 'enabled')) {
+            jabber_confirm_address($confirm->code,
+                                   $user->nickname,
+                                   $jabber);
+        }
+
+        $msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
+
+        $this->show_form($msg, TRUE);
+    }
+
+    function cancel_confirmation() {
+        $jabber = $this->arg('jabber');
+        $confirm = $this->get_confirmation();
+        if (!$confirm) {
+            $this->show_form(_('No pending confirmation to cancel.'));
+            return;
+        }
+        if ($confirm->address != $jabber) {
+            $this->show_form(_('That is the wrong IM address.'));
+            return;
+        }
 
         $result = $confirm->delete();
 
         if (!$result) {
-			common_log_db_error($confirm, 'DELETE', __FILE__);
+            common_log_db_error($confirm, 'DELETE', __FILE__);
             $this->server_error(_('Couldn\'t delete email confirmation.'));
             return;
         }
 
         $this->show_form(_('Confirmation cancelled.'), TRUE);
-	}
-
-	function remove_address() {
-
-		$user = common_current_user();
-		$jabber = $this->arg('jabber');
-
-		# Maybe an old tab open...?
-
-		if ($user->jabber != $jabber) {
-		    $this->show_form(_('That is not your Jabber ID.'));
-		    return;
-		}
-
-		$user->query('BEGIN');
-		$original = clone($user);
-		$user->jabber = NULL;
-		$result = $user->updateKeys($original);
-		if (!$result) {
-			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_('Couldn\'t update user.'));
-			return;
-		}
-		$user->query('COMMIT');
-
-		# XXX: unsubscribe to the old address
-
-		$this->show_form(_('The address was removed.'), TRUE);
-	}
-
-	function jabber_exists($jabber) {
-		$user = common_current_user();
-		$other = User::staticGet('jabber', $jabber);
-		if (!$other) {
-			return false;
-		} else {
-			return $other->id != $user->id;
-		}
-	}
+    }
+
+    function remove_address() {
+
+        $user = common_current_user();
+        $jabber = $this->arg('jabber');
+
+        # Maybe an old tab open...?
+
+        if ($user->jabber != $jabber) {
+            $this->show_form(_('That is not your Jabber ID.'));
+            return;
+        }
+
+        $user->query('BEGIN');
+        $original = clone($user);
+        $user->jabber = NULL;
+        $result = $user->updateKeys($original);
+        if (!$result) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            common_server_error(_('Couldn\'t update user.'));
+            return;
+        }
+        $user->query('COMMIT');
+
+        # XXX: unsubscribe to the old address
+
+        $this->show_form(_('The address was removed.'), TRUE);
+    }
+
+    function jabber_exists($jabber) {
+        $user = common_current_user();
+        $other = User::staticGet('jabber', $jabber);
+        if (!$other) {
+            return false;
+        } else {
+            return $other->id != $user->id;
+        }
+    }
 }