X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funblock.php;h=82d0d32c109149f3e732754c3bfffb61fd9e0121;hb=8616055959c6ac4ae91fe5fc62e8c8ac2aa7257c;hp=192beaab5b61eeade016745ca5b89a5457e65ac1;hpb=cd5eec767aaa88fab29e781b12d53d0c92226f3b;p=quix0rs-gnu-social.git

diff --git a/actions/unblock.php b/actions/unblock.php
index 192beaab5b..82d0d32c10 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -1,7 +1,18 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Unblock a user action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,86 +28,61 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-class UnblockAction extends Action {
-
-    var $profile = NULL;
-
-    function prepare($args) {
-
-        parent::prepare($args);
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
 
-        if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+/**
+ * Unblock a user action class.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class UnblockAction extends ProfileFormAction
+{
+    function prepare($args)
+    {
+        if (!parent::prepare($args)) {
             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.'));
-			return;
-		}
-
-        $id = $this->trimmed('unblockto');
-
-        if (!$id) {
-            $this->client_error(_('No profile specified.'));
-            return false;
-        }
+        $cur = common_current_user();
 
-        $this->profile = Profile::staticGet('id', $id);
+        assert(!empty($cur)); // checked by parent
 
-        if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
-            return false;
+        if (!$cur->hasBlocked($this->profile)) {
+            // TRANS: Client error displayed when trying to unblock a non-blocked user.
+            $this->clientError(_("You haven't blocked that user."));
         }
 
         return true;
     }
 
-    function handle($args) {
-        parent::handle($args);
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->unblock_profile();
-        }
-    }
-
-    function unblock_profile() {
-
+    /**
+     * Unblock a user.
+     *
+     * @return void
+     */
+    function handlePost()
+    {
         $cur = common_current_user();
 
-        # Get the block record
-
-        $block = Profile_block::get($cur->id, $this->profile->id);
+        $result = false;
 
-        if (!$block) {
-            $this->client_error(_('That user is not blocked!'));
-            return;
-        }
-
-        $result = $block->delete();
-
-        if (!$result) {
-            common_log_db_error($block, 'DELETE', __FILE__);
-            $this->server_error(_('Could not delete block record.'));
-            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;
+        if (Event::handle('StartUnblockProfile', array($cur, $this->profile))) {
+            $result = $cur->unblock($this->profile);
+            if ($result) {
+                Event::handle('EndUnblockProfile', array($cur, $this->profile));
             }
         }
 
-        if ($action) {
-            common_redirect(common_local_url($action, $args));
-        } else {
-            common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $cur->nickname)));
+        if (!$result) {
+            // TRANS: Server error displayed when removing a user block.
+            $this->serverError(_('Error removing the block.'));
         }
     }
 }