X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fapiblockcreate.php;h=53844cd2f299e3ec233a4e47da6884301015083d;hb=47cf29b2a2fd82b0045dad7686633200479a6b37;hp=ff303863ecd79528ab7a4330a95942fb4885f1e0;hpb=09f4d1ef236c160afe6b9874793e43b501e1120a;p=quix0rs-gnu-social.git

diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index ff303863ec..53844cd2f2 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -21,8 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -34,12 +35,13 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
- * Blocks the user specified in the ID parameter as the authenticating user. 
- * Destroys a friendship to the blocked user if it exists. Returns the 
+ * Blocks the user specified in the ID parameter as the authenticating user.
+ * Destroys a friendship to the blocked user if it exists. Returns the
  * blocked user in the requested format when successful.
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -47,8 +49,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockCreateAction extends ApiAuthAction
 {
-    var $format  = null;
-    var $user    = null;
     var $other   = null;
 
     /**
@@ -64,15 +64,8 @@ class ApiBlockCreateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
-        $this->other  = $this->getTargetUser($this->arg('id'));
-        $this->format = $this->arg('format');
+        $this->other  = $this->getTargetProfile($this->arg('id'));
 
         return true;
     }
@@ -93,28 +86,47 @@ class ApiBlockCreateAction extends ApiAuthAction
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             $this->clientError(
+                // TRANS: Client error. POST is a HTTP command. It should not be translated.
                 _('This method requires a POST.'),
                 400,
                 $this->format
             );
             return;
         }
-        
+
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        // Don't allow blocking yourself!
+
+        if ($this->user->id == $this->other->id) {
+            $this->clientError(
+                _("You cannot block yourself!"),
+                403,
+                $this->format
+            );
             return;
         }
-        
-        if ($this->user->hasBlocked($this->other) 
-            || $this->user->block($this->other)
-        ) {
-            $this->init_document($this->format);
-            $this->show_profile($this->other, $this->format);
-            $this->end_document($this->format);
+
+        if (!$this->user->hasBlocked($this->other)) {
+            if (Event::handle('StartBlockProfile', array($this->user, $this->other))) {
+                $result = $this->user->block($this->other);
+                if ($result) {
+                    Event::handle('EndBlockProfile', array($this->user, $this->other));
+                }
+            }
+        }
+
+        if ($this->user->hasBlocked($this->other)) {
+            $this->initDocument($this->format);
+            $this->showProfile($this->other, $this->format);
+            $this->endDocument($this->format);
         } else {
             $this->serverError(_('Block user failed.'), 500, $this->format);
         }
-        
+
     }
 
 }