Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/grantrole.php b/actions/grantrole.php
index b8b23d02e91d8c70f8494bfb5c7b20c3bf70948d..59cb1cdd8eb39d320bc79b1db9e34a72ff3b5f75 100644 (file)
--- a/actions/grantrole.php
+++ b/actions/grantrole.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Action class to sandbox an abusive user
+ * Action class to grant user roles.
  *
  * PHP version 5
  *
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Sandbox a user.
+ * Assign role to user.
  *
  * @category Action
  * @package  StatusNet
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class GrantRoleAction extends ProfileFormAction
 {
     /**
@@ -50,21 +49,20 @@ class GrantRoleAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
         }
-        
+
         $this->role = $this->arg('role');
         if (!Profile_role::isValid($this->role)) {
+            // TRANS: Client error displayed when trying to assign an invalid role to a user.
             $this->clientError(_('Invalid role.'));
-            return false;
         }
         if (!Profile_role::isSettable($this->role)) {
+            // TRANS: Client error displayed when trying to assign an reserved role to a user.
             $this->clientError(_('This role is reserved and cannot be set.'));
-            return false;
         }
 
         $cur = common_current_user();
@@ -72,15 +70,15 @@ class GrantRoleAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasRight(Right::GRANTROLE)) {
+            // TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
             $this->clientError(_('You cannot grant user roles on this site.'));
-            return false;
         }
 
         assert(!empty($this->profile)); // checked by parent
 
         if ($this->profile->hasRole($this->role)) {
+            // TRANS: Client error displayed when trying to assign a role to a user that already has that role.
             $this->clientError(_('User already has this role.'));
-            return false;
         }
 
         return true;
@@ -91,7 +89,6 @@ class GrantRoleAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         $this->profile->grantRole($this->role);