X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fblock.php;h=c1ff7c04462308ef20af2332a268ed2b4b95369b;hb=125f05563b5c7bd5b74b1afbea3c0b663795bff5;hp=b507af3249cf39e6867b5fa22c37318a9e18e746;hpb=2ced62bd7ef31f91cc1b4a145f47b074e1fbcd0d;p=quix0rs-gnu-social.git

diff --git a/actions/block.php b/actions/block.php
index b507af3249..c1ff7c0446 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -19,11 +19,13 @@
 
 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);
 
@@ -32,12 +34,12 @@ class BlockAction extends Action {
             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->client_error(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
 
         $id = $this->trimmed('blockto');
 
@@ -56,7 +58,8 @@ class BlockAction extends Action {
         return true;
     }
 
-    function handle($args) {
+    function handle($args)
+    {
         parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if ($this->arg('block')) {
@@ -71,13 +74,14 @@ class BlockAction extends Action {
         }
     }
 
-    function are_you_sure_form() {
+    function are_you_sure_form()
+    {
 
         $id = $this->profile->id;
 
-		common_show_header(_('Block user'));
+        common_show_header(_('Block user'));
 
-        common_element('p', NULL,
+        common_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 '.
@@ -95,6 +99,12 @@ class BlockAction extends Action {
                                       'type' => 'hidden',
                                       'value' => $id));
 
+        foreach ($this->args as $k => $v) {
+            if (substr($k, 0, 9) == 'returnto-') {
+                common_hidden($k, $v);
+            }
+        }
+
         common_submit('no', _('No'));
         common_submit('yes', _('Yes'));
 
@@ -103,7 +113,8 @@ class BlockAction extends Action {
         common_show_footer();
     }
 
-    function block_profile() {
+    function block_profile()
+    {
 
         $cur = common_current_user();
 
@@ -112,42 +123,28 @@ class BlockAction extends Action {
             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->server_error(_('Failed to save block information.'));
             return;
         }
 
-        # Cancel their subscription, if it exists
+        # Now, gotta figure where we go back to
 
-		$sub = Subscription::pkeyGet(array('subscriber' => $this->profile->id,
-										   'subscribed' => $cur->id));
-
-        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)));
+        }
     }
 }