X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fblock.php;h=738cbfbf7142e6a381bbb4b54e69e7239d5ac2f6;hb=6edbf3ca781d20f2ec98daf32080c60e804d8215;hp=a9fcfb49c58ea13df22d4b5caa63ad0faaa83d8f;hpb=9b4df5056f2dba6b6fa7ac392c2114fd3c1400a0;p=quix0rs-gnu-social.git

diff --git a/actions/block.php b/actions/block.php
index a9fcfb49c5..738cbfbf71 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -19,42 +19,48 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class BlockAction extends Action {
+class BlockAction extends Action
+{
 
-    var $profile = NULL;
+    var $profile = null;
 
-    function prepare($args) {
+    function prepare($args)
+    {
 
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return false;
         }
 
-		$token = $this->trimmed('token');
+        $token = $this->trimmed('token');
 
-		if (!$token || $token != common_session_token()) {
-			$this->client_error(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
+        if (!$token || $token != common_session_token()) {
+            $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;
         }
+
+        return true;
     }
 
-    function handle($args=NULL) {
+    function handle($args)
+    {
+        parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if ($this->arg('block')) {
                 $this->are_you_sure_form();
@@ -68,79 +74,77 @@ class BlockAction extends Action {
         }
     }
 
-    function are_you_sure_form() {
+    function are_you_sure_form()
+    {
 
         $id = $this->profile->id;
 
-        common_element_start('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_show_header(_('Block user'));
+
+        $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));
 
-        common_submit('no', _('No'));
-        common_submit('yes', _('Yes'));
+        foreach ($this->args as $k => $v) {
+            if (substr($k, 0, 9) == 'returnto-') {
+                $this->hidden($k, $v);
+            }
+        }
+
+        $this->submit('no', _('No'));
+        $this->submit('yes', _('Yes'));
+
+        $this->elementEnd('form');
 
-        common_element_end('form');
+        common_show_footer();
     }
 
-    function block_profile() {
+    function block_profile()
+    {
 
         $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;
         }
 
-        # Add a new block record
-
-        $block = new Profile_block();
-
-        # Begin a transaction
-
-        $block->query('BEGIN');
-
-        $block->blocker = $cur->id;
-        $block->blocked = $this->profile->id;
-
-        $result = $block->insert();
+        $result = $cur->block($this->profile);
 
         if (!$result) {
-            common_log_db_error($block, 'INSERT', __FILE__);
-            $this->server_error(_('Could not save new block record.'));
+            $this->serverError(_('Failed to save block information.'));
             return;
         }
 
-        # Cancel their subscription, if it exists
-
-		$sub = Subscription::pkeyGet(array('subscriber' => $this->profile->id,
-										   'subscribed' => $cur->id));
+        # Now, gotta figure where we go back to
 
-        if ($sub) {
-            $result = $sub->delete();
-            if (!$result) {
-                common_log_db_error($sub, 'DELETE', __FILE__);
-                $this->server_error(_('Could not delete subscription.'));
-                return;
+        foreach ($this->args as $k => $v) {
+            if ($k == 'returnto-action') {
+                $action = $v;
+            } else if (substr($k, 0, 9) == 'returnto-') {
+                $args[substr($k, 9)] = $v;
             }
         }
 
-        $block->query('COMMIT');
-
-        common_redirect(common_local_url('subscribers',
-                                         array('nickname' => $cur->nickname)));
+        if ($action) {
+            common_redirect(common_local_url($action, $args));
+        } else {
+            common_redirect(common_local_url('subscriptions',
+                                             array('nickname' => $cur->nickname)));
+        }
     }
 }