X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Frevokerole.php;h=b55399598eebd81c4e982de0b1d2d7ac71e4e0a9;hb=b0abce9bc8d6e21f0f15557ed083bc80460d3867;hp=b78c1c25a4f2f8a04926dff64565cfe07fd9895d;hpb=b218aee94e581230e1efa14d4ae1a19756986ddf;p=quix0rs-gnu-social.git diff --git a/actions/revokerole.php b/actions/revokerole.php index b78c1c25a4..b55399598e 100644 --- a/actions/revokerole.php +++ b/actions/revokerole.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ - class RevokeRoleAction extends ProfileFormAction { /** @@ -50,21 +49,20 @@ class RevokeRoleAction extends ProfileFormAction * * @return boolean success flag */ - function prepare($args) { if (!parent::prepare($args)) { return false; } - + $this->role = $this->arg('role'); if (!Profile_role::isValid($this->role)) { - $this->clientError(_("Invalid role.")); - return false; + // TRANS: Client error displayed when trying to revoke an invalid role. + $this->clientError(_('Invalid role.')); } if (!Profile_role::isSettable($this->role)) { - $this->clientError(_("This role is reserved and cannot be set.")); - return false; + // TRANS: Client error displayed when trying to revoke a reserved role. + $this->clientError(_('This role is reserved and cannot be set.')); } $cur = common_current_user(); @@ -72,15 +70,15 @@ class RevokeRoleAction extends ProfileFormAction assert(!empty($cur)); // checked by parent if (!$cur->hasRight(Right::REVOKEROLE)) { - $this->clientError(_("You cannot revoke user roles on this site.")); - return false; + // TRANS: Client error displayed when trying to revoke a role without having the right to do that. + $this->clientError(_('You cannot revoke user roles on this site.')); } assert(!empty($this->profile)); // checked by parent if (!$this->profile->hasRole($this->role)) { - $this->clientError(_("User doesn't have this role.")); - return false; + // TRANS: Client error displayed when trying to revoke a role that is not set. + $this->clientError(_('User does not have this role.')); } return true; @@ -91,7 +89,6 @@ class RevokeRoleAction extends ProfileFormAction * * @return void */ - function handlePost() { $this->profile->revokeRole($this->role);