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

diff --git a/actions/othersettings.php b/actions/othersettings.php
index eccf90e91..9b824cea2 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -23,159 +23,159 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class OthersettingsAction extends SettingsAction {
 
-	function get_instructions() {
-		return _('Manage various other options.');
-	}
+    function get_instructions() {
+        return _('Manage various other options.');
+    }
 
-	function show_form($msg=NULL, $success=false) {
-		$user = common_current_user();
+    function show_form($msg=NULL, $success=false) {
+        $user = common_current_user();
 
-		$this->form_header(_('Other Settings'), $msg, $success);
+        $this->form_header(_('Other Settings'), $msg, $success);
 
-		common_element('h2', NULL, _('URL Auto-shortening'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'othersettings',
-										   'action' =>
-										   common_local_url('othersettings')));
-		common_hidden('token', common_session_token());
+        common_element('h2', NULL, _('URL Auto-shortening'));
+        common_element_start('form', array('method' => 'post',
+                                           'id' => 'othersettings',
+                                           'action' =>
+                                           common_local_url('othersettings')));
+        common_hidden('token', common_session_token());
 
-		$services = array(
-			'' => 'None',
+        $services = array(
+            '' => 'None',
             'ur1.ca' => 'ur1.ca (free service)',
             '2tu.us' => '2tu.us (free service)',
             'ptiturl.com' => 'ptiturl.com',
             'bit.ly' => 'bit.ly',
-			'tinyurl.com' => 'tinyurl.com',
-			'is.gd' => 'is.gd',
-			'snipr.com' => 'snipr.com',
-			'metamark.net' => 'metamark.net'
-		);
+            'tinyurl.com' => 'tinyurl.com',
+            'is.gd' => 'is.gd',
+            'snipr.com' => 'snipr.com',
+            'metamark.net' => 'metamark.net'
+        );
 
-		common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), FALSE, $user->urlshorteningservice);
+        common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), FALSE, $user->urlshorteningservice);
 
-		common_submit('save', _('Save'));
+        common_submit('save', _('Save'));
 
-		common_element_end('form');
+        common_element_end('form');
 
-//		common_element('h2', NULL, _('Delete my account'));
-//		$this->show_delete_form();
+//        common_element('h2', NULL, _('Delete my account'));
+//        $this->show_delete_form();
 
-		common_show_footer();
-	}
+        common_show_footer();
+    }
 
-	function show_feeds_list($feeds) {
-		common_element_start('div', array('class' => 'feedsdel'));
-		common_element('p', null, 'Feeds:');
-		common_element_start('ul', array('class' => 'xoxo'));
+    function show_feeds_list($feeds) {
+        common_element_start('div', array('class' => 'feedsdel'));
+        common_element('p', null, 'Feeds:');
+        common_element_start('ul', array('class' => 'xoxo'));
 
-		foreach ($feeds as $key => $value) {
-			$this->common_feed_item($feeds[$key]);
-		}
-		common_element_end('ul');
-		common_element_end('div');
-	}
+        foreach ($feeds as $key => $value) {
+            $this->common_feed_item($feeds[$key]);
+        }
+        common_element_end('ul');
+        common_element_end('div');
+    }
 
     //TODO move to common.php (and retrace its origin)
-	function common_feed_item($feed) {
+    function common_feed_item($feed) {
         $user = common_current_user();
-		$nickname = $user->nickname;
-
-		switch($feed['item']) {
-			case 'notices': default:
-				$feed_classname = $feed['type'];
-				$feed_mimetype = "application/".$feed['type']."+xml";
-				$feed_title = "$nickname's ".$feed['version']." notice feed";
-				$feed['textContent'] = "RSS";
-				break;
-
-			case 'foaf':
-				$feed_classname = "foaf";
-				$feed_mimetype = "application/".$feed['type']."+xml";
-				$feed_title = "$nickname's FOAF file";
-				$feed['textContent'] = "FOAF";
-				break;
-		}
-		common_element_start('li');
-		common_element('a', array('href' => $feed['href'],
-								  'class' => $feed_classname,
-								  'type' => $feed_mimetype,
-								  'title' => $feed_title),
-							$feed['textContent']);
-		common_element_end('li');
-	}
-
-//	function show_delete_form() {
-//		$user = common_current_user();
+        $nickname = $user->nickname;
+
+        switch($feed['item']) {
+            case 'notices': default:
+                $feed_classname = $feed['type'];
+                $feed_mimetype = "application/".$feed['type']."+xml";
+                $feed_title = "$nickname's ".$feed['version']." notice feed";
+                $feed['textContent'] = "RSS";
+                break;
+
+            case 'foaf':
+                $feed_classname = "foaf";
+                $feed_mimetype = "application/".$feed['type']."+xml";
+                $feed_title = "$nickname's FOAF file";
+                $feed['textContent'] = "FOAF";
+                break;
+        }
+        common_element_start('li');
+        common_element('a', array('href' => $feed['href'],
+                                  'class' => $feed_classname,
+                                  'type' => $feed_mimetype,
+                                  'title' => $feed_title),
+                            $feed['textContent']);
+        common_element_end('li');
+    }
+
+//    function show_delete_form() {
+//        $user = common_current_user();
 //      $notices = DB_DataObject::factory('notice');
 //      $notices->profile_id = $user->id;
 //      $notice_count = (int) $notices->count();
 //
-//		common_element_start('form', array('method' => 'POST',
-//										   'id' => 'delete',
-//										   'action' =>
-//										   common_local_url('deleteprofile')));
+//        common_element_start('form', array('method' => 'POST',
+//                                           'id' => 'delete',
+//                                           'action' =>
+//                                           common_local_url('deleteprofile')));
 //
-//		common_hidden('token', common_session_token());
+//        common_hidden('token', common_session_token());
 //      common_element('p', null, "You can copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
 //
-//		$this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
-//											  'type' => 'rss',
-//											  'version' => 'RSS 1.0',
-//											  'item' => 'notices'),
-//									 1=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
-//											  'type' => 'rdf',
-//											  'version' => 'FOAF',
-//											  'item' => 'foaf')));
+//        $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
+//                                              'type' => 'rss',
+//                                              'version' => 'RSS 1.0',
+//                                              'item' => 'notices'),
+//                                     1=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
+//                                              'type' => 'rdf',
+//                                              'version' => 'FOAF',
+//                                              'item' => 'foaf')));
 //
-//		common_submit('deleteaccount', _('Delete my account'));
-//		common_element_end('form');
-//	}
+//        common_submit('deleteaccount', _('Delete my account'));
+//        common_element_end('form');
+//    }
 
-	function handle_post() {
+    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;
-		}
+        # 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 {
-			$this->show_form(_('Unexpected form submission.'));
-		}
-	}
+        if ($this->arg('save')) {
+            $this->save_preferences();
+        }else {
+            $this->show_form(_('Unexpected form submission.'));
+        }
+    }
 
-	function save_preferences() {
+    function save_preferences() {
 
-		$urlshorteningservice = $this->trimmed('urlshorteningservice');
+        $urlshorteningservice = $this->trimmed('urlshorteningservice');
 
-		if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
-			$this->show_form(_('URL shortening service is too long (max 50 chars).'));
-			return;
-		}
+        if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
+            $this->show_form(_('URL shortening service is too long (max 50 chars).'));
+            return;
+        }
 
-		$user = common_current_user();
+        $user = common_current_user();
 
-		assert(!is_null($user)); # should already be checked
+        assert(!is_null($user)); # should already be checked
 
-		$user->query('BEGIN');
+        $user->query('BEGIN');
 
-		$original = clone($user);
+        $original = clone($user);
 
-		$user->urlshorteningservice = $urlshorteningservice;
+        $user->urlshorteningservice = $urlshorteningservice;
 
-		$result = $user->update($original);
+        $result = $user->update($original);
 
-		if ($result === FALSE) {
-			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_('Couldn\'t update user.'));
-			return;
-		}
+        if ($result === FALSE) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            common_server_error(_('Couldn\'t update user.'));
+            return;
+        }
 
-		$user->query('COMMIT');
+        $user->query('COMMIT');
 
-		$this->show_form(_('Preferences saved.'), true);
-	}
+        $this->show_form(_('Preferences saved.'), true);
+    }
 }