Update favorited for new layout and framework

[quix0rs-gnu-social.git] / actions / block.php

diff --git a/actions/block.php b/actions/block.php
index c1ff7c04462308ef20af2332a268ed2b4b95369b..738cbfbf7142e6a381bbb4b54e69e7239d5ac2f6 100644 (file)
--- a/actions/block.php
+++ b/actions/block.php
@@ -30,28 +30,28 @@ class BlockAction extends Action
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return false;
         }
 
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
         $id = $this->trimmed('blockto');
 
         if (!$id) {
-            $this->client_error(_('No profile specified.'));
+            $this->clientError(_('No profile specified.'));
             return false;
         }
 
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
+            $this->clientError(_('No profile with that ID.'));
             return false;
         }
 
@@ -81,34 +81,34 @@ class BlockAction extends Action
 
         common_show_header(_('Block user'));
 
-        common_element('p', null,
+        $this->element('p', null,
                        _('Are you sure you want to block this user? '.
                          'Afterwards, they will be unsubscribed from you, '.
                          'unable to subscribe to you in the future, and '.
                          'you will not be notified of any @-replies from them.'));
 
-        common_element_start('form', array('id' => 'block-' . $id,
+        $this->elementStart('form', array('id' => 'block-' . $id,
                                            'method' => 'post',
                                            'class' => 'block',
                                            'action' => common_local_url('block')));
 
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
-        common_element('input', array('id' => 'blockto-' . $id,
+        $this->element('input', array('id' => 'blockto-' . $id,
                                       'name' => 'blockto',
                                       'type' => 'hidden',
                                       'value' => $id));
 
         foreach ($this->args as $k => $v) {
             if (substr($k, 0, 9) == 'returnto-') {
-                common_hidden($k, $v);
+                $this->hidden($k, $v);
             }
         }
 
-        common_submit('no', _('No'));
-        common_submit('yes', _('Yes'));
+        $this->submit('no', _('No'));
+        $this->submit('yes', _('Yes'));
 
-        common_element_end('form');
+        $this->elementEnd('form');
 
         common_show_footer();
     }
@@ -119,14 +119,14 @@ class BlockAction extends Action
         $cur = common_current_user();
 
         if ($cur->hasBlocked($this->profile)) {
-            $this->client_error(_('You have already blocked this user.'));
+            $this->clientError(_('You have already blocked this user.'));
             return;
         }
 
         $result = $cur->block($this->profile);
 
         if (!$result) {
-            $this->server_error(_('Failed to save block information.'));
+            $this->serverError(_('Failed to save block information.'));
             return;
         }