More RESTish URL (/notice/:notice/delete) for notice delete

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

diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 6beb463528f8ffa35f2a460b08c710ea7f379432..a24177f64c0d94d8a50dd5b06abfa7066ac2ec09 100644 (file)
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -5,13 +5,13 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * 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
@@ -27,20 +27,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
 /**
- * Unlock a user from a group
+ * Unblock a user from a group
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class GroupunblockAction extends Action
 {
     var $profile = null;
@@ -53,47 +52,46 @@ class GroupunblockAction extends Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
         if (!common_logged_in()) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return false;
         }
         $token = $this->trimmed('token');
         if (empty($token) || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token. Try again, please.'));
-            return;
         }
         $id = $this->trimmed('unblockto');
         if (empty($id)) {
+            // TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
             $this->clientError(_('No profile specified.'));
-            return false;
         }
-        $this->profile = Profile::staticGet('id', $id);
+        $this->profile = Profile::getKV('id', $id);
         if (empty($this->profile)) {
+            // TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
             $this->clientError(_('No profile with that ID.'));
-            return false;
         }
         $group_id = $this->trimmed('unblockgroup');
         if (empty($group_id)) {
+            // TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
             $this->clientError(_('No group specified.'));
-            return false;
         }
-        $this->group = User_group::staticGet('id', $group_id);
+        $this->group = User_group::getKV('id', $group_id);
         if (empty($this->group)) {
+            // TRANS: Client error displayed when trying to unblock a user from a non-existing group.
             $this->clientError(_('No such group.'));
-            return false;
         }
         $user = common_current_user();
         if (!$user->isAdmin($this->group)) {
+            // TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
             $this->clientError(_('Only an admin can unblock group members.'), 401);
-            return false;
         }
         if (!Group_block::isBlocked($this->group, $this->profile)) {
+            // TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
             $this->clientError(_('User is not blocked from group.'));
-            return false;
         }
         return true;
     }
@@ -105,7 +103,6 @@ class GroupunblockAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -119,14 +116,13 @@ class GroupunblockAction extends Action
      *
      * @return void
      */
-
     function unblockProfile()
     {
         $result = Group_block::unblockProfile($this->group, $this->profile);
 
         if (!$result) {
+            // TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
             $this->serverError(_('Error removing the block.'));
-            return;
         }
 
         foreach ($this->args as $k => $v) {
@@ -140,10 +136,7 @@ class GroupunblockAction extends Action
         if ($action) {
             common_redirect(common_local_url($action, $args), 303);
         } else {
-            common_redirect(common_local_url('blockedfromgroup',
-                                             array('nickname' => $this->group->nickname)),
-                            303);
+            common_redirect(common_local_url('blockedfromgroup', array('nickname' => $this->group->nickname)), 303);
         }
     }
 }
-