X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fgroupblock.php;h=d65b62bdff7980128e5d634ddc687729448973d0;hb=76004660e9138b94668263769d4b10cfb1e77955;hp=2ac0f633bbe4f0ce1da554ce4974e0d3d37ac21f;hpb=8f776ec12d4a6c73a1e65e8732bf12a583eb2445;p=quix0rs-gnu-social.git

diff --git a/actions/groupblock.php b/actions/groupblock.php
index 2ac0f633bb..d65b62bdff 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -56,55 +56,47 @@ class GroupblockAction extends RedirectingAction
     {
         parent::prepare($args);
         if (!common_logged_in()) {
-            // TRANS: Client error displayed trying to block a user from a group while not 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('blockto');
         if (empty($id)) {
             // TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user 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 trying to block a user from a group while specifying a non-existing profile.
             $this->clientError(_('No profile with that ID.'));
-            return false;
         }
         $group_id = $this->trimmed('blockgroup');
         if (empty($group_id)) {
             // TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
             $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 trying to block a user from a group while specifying a non-existing group.
             $this->clientError(_('No such group.'));
-            return false;
         }
         $user = common_current_user();
         if (!$user->isAdmin($this->group)) {
             // TRANS: Client error displayed trying to block a user from a group while not being an admin user.
             $this->clientError(_('Only an admin can block group members.'), 401);
-            return false;
         }
         if (Group_block::isBlocked($this->group, $this->profile)) {
             // TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
             $this->clientError(_('User is already blocked from group.'));
-            return false;
         }
         // XXX: could have proactive blocks, but we don't have UI for it.
         if (!$this->profile->isMember($this->group)) {
             // TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
             $this->clientError(_('User is not a member of group.'));
-            return false;
         }
         return true;
     }
@@ -188,14 +180,14 @@ class GroupblockAction extends RedirectingAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when blocking a user from a group.
-                      _('Do not block this user from this group'));
+                      _('Do not block this user from this group.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the form to block a user from a group.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when blocking a user from a group.
-                      _('Block this user from this group'));
+                      _('Block this user from this group.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -213,7 +205,6 @@ class GroupblockAction extends RedirectingAction
         if (empty($block)) {
             // TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
             $this->serverError(_("Database error blocking user from group."));
-            return false;
         }
 
         $this->returnToPrevious();