Tabs to spaces.

diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 6942a53bb875444864e95d345635d56575f7acf6..766d91bd41d8fe9ed63c75da3caa40b2a8d4b17a 100644 (file)
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -92,7 +92,7 @@ class ApiBlockCreateAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
-                 // TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
+            // TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 6780928157a58d3e10cbff4dd20d94e8377b520b..b3bd6d104cd4b9dd1ea59391afdc629e5fbd84c1 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -207,45 +207,45 @@ class EmailsettingsAction extends SettingsAction
         $this->elementStart('ul', 'form_data');
 
         if (Event::handle('StartEmailFormData', array($this))) {
-           $this->elementStart('li');
-           $this->checkbox('emailnotifysub',
-                           // TRANS: Checkbox label in e-mail preferences form.
-                           _('Send me notices of new subscriptions through email.'),
-                           $user->emailnotifysub);
-           $this->elementEnd('li');
-           $this->elementStart('li');
-           $this->checkbox('emailnotifyfav',
-                           // TRANS: Checkbox label in e-mail preferences form.
-                           _('Send me email when someone '.
-                             'adds my notice as a favorite.'),
-                           $user->emailnotifyfav);
-           $this->elementEnd('li');
-           $this->elementStart('li');
-           $this->checkbox('emailnotifymsg',
-                           // TRANS: Checkbox label in e-mail preferences form.
-                           _('Send me email when someone sends me a private message.'),
-                           $user->emailnotifymsg);
-           $this->elementEnd('li');
-           $this->elementStart('li');
-           $this->checkbox('emailnotifyattn',
-                           // TRANS: Checkbox label in e-mail preferences form.
-                           _('Send me email when someone sends me an "@-reply".'),
-                           $user->emailnotifyattn);
-           $this->elementEnd('li');
-           $this->elementStart('li');
-           $this->checkbox('emailnotifynudge',
-                           // TRANS: Checkbox label in e-mail preferences form.
-                           _('Allow friends to nudge me and send me an email.'),
-                           $user->emailnotifynudge);
-           $this->elementEnd('li');
-           $this->elementStart('li');
-           $this->checkbox('emailmicroid',
-                           // TRANS: Checkbox label in e-mail preferences form.
-                           _('Publish a MicroID for my email address.'),
-                           $user->emailmicroid);
-           $this->elementEnd('li');
-           Event::handle('EndEmailFormData', array($this));
-       }
+            $this->elementStart('li');
+            $this->checkbox('emailnotifysub',
+                            // TRANS: Checkbox label in e-mail preferences form.
+                            _('Send me notices of new subscriptions through email.'),
+                            $user->emailnotifysub);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->checkbox('emailnotifyfav',
+                            // TRANS: Checkbox label in e-mail preferences form.
+                            _('Send me email when someone '.
+                              'adds my notice as a favorite.'),
+                            $user->emailnotifyfav);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->checkbox('emailnotifymsg',
+                            // TRANS: Checkbox label in e-mail preferences form.
+                            _('Send me email when someone sends me a private message.'),
+                            $user->emailnotifymsg);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->checkbox('emailnotifyattn',
+                            // TRANS: Checkbox label in e-mail preferences form.
+                            _('Send me email when someone sends me an "@-reply".'),
+                            $user->emailnotifyattn);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->checkbox('emailnotifynudge',
+                            // TRANS: Checkbox label in e-mail preferences form.
+                            _('Allow friends to nudge me and send me an email.'),
+                            $user->emailnotifynudge);
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            $this->checkbox('emailmicroid',
+                            // TRANS: Checkbox label in e-mail preferences form.
+                            _('Publish a MicroID for my email address.'),
+                            $user->emailmicroid);
+            $this->elementEnd('li');
+            Event::handle('EndEmailFormData', array($this));
+        }
         $this->elementEnd('ul');
         // TRANS: Button label to save e-mail preferences.
         $this->submit('save', _m('BUTTON','Save'));
@@ -319,48 +319,47 @@ class EmailsettingsAction extends SettingsAction
      */
     function savePreferences()
     {
-       $user = common_current_user();
-
-       if (Event::handle('StartEmailSaveForm', array($this, &$user))) {
+        $user = common_current_user();
 
-           $emailnotifysub   = $this->boolean('emailnotifysub');
-           $emailnotifyfav   = $this->boolean('emailnotifyfav');
-           $emailnotifymsg   = $this->boolean('emailnotifymsg');
-           $emailnotifynudge = $this->boolean('emailnotifynudge');
-           $emailnotifyattn  = $this->boolean('emailnotifyattn');
-           $emailmicroid     = $this->boolean('emailmicroid');
-           $emailpost        = $this->boolean('emailpost');
+        if (Event::handle('StartEmailSaveForm', array($this, &$user))) {
+            $emailnotifysub   = $this->boolean('emailnotifysub');
+            $emailnotifyfav   = $this->boolean('emailnotifyfav');
+            $emailnotifymsg   = $this->boolean('emailnotifymsg');
+            $emailnotifynudge = $this->boolean('emailnotifynudge');
+            $emailnotifyattn  = $this->boolean('emailnotifyattn');
+            $emailmicroid     = $this->boolean('emailmicroid');
+            $emailpost        = $this->boolean('emailpost');
 
-           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->emailnotifysub   = $emailnotifysub;
-           $user->emailnotifyfav   = $emailnotifyfav;
-           $user->emailnotifymsg   = $emailnotifymsg;
-           $user->emailnotifynudge = $emailnotifynudge;
-           $user->emailnotifyattn  = $emailnotifyattn;
-           $user->emailmicroid     = $emailmicroid;
-           $user->emailpost        = $emailpost;
+            $user->emailnotifysub   = $emailnotifysub;
+            $user->emailnotifyfav   = $emailnotifyfav;
+            $user->emailnotifymsg   = $emailnotifymsg;
+            $user->emailnotifynudge = $emailnotifynudge;
+            $user->emailnotifyattn  = $emailnotifyattn;
+            $user->emailmicroid     = $emailmicroid;
+            $user->emailpost        = $emailpost;
 
-           $result = $user->update($original);
+            $result = $user->update($original);
 
-           if ($result === false) {
-               common_log_db_error($user, 'UPDATE', __FILE__);
-               // TRANS: Server error thrown on database error updating e-mail preferences.
-               $this->serverError(_('Could not update user.'));
-               return;
-           }
+            if ($result === false) {
+                common_log_db_error($user, 'UPDATE', __FILE__);
+                // TRANS: Server error thrown on database error updating e-mail preferences.
+                $this->serverError(_('Could not update user.'));
+                return;
+            }
 
-           $user->query('COMMIT');
+            $user->query('COMMIT');
 
-           Event::handle('EndEmailSaveForm', array($this));
+            Event::handle('EndEmailSaveForm', array($this));
 
-           // TRANS: Confirmation message for successful e-mail preferences save.
-           $this->showForm(_('Email preferences saved.'), true);
-       }
+            // TRANS: Confirmation message for successful e-mail preferences save.
+            $this->showForm(_('Email preferences saved.'), true);
+        }
     }
 
     /**