X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fblockedfromgroup.php;h=60f108dee383a333a35dbcec167655cd1c10512d;hb=3f28b17c86c4cd88d4f39629ea8a89ec3a820790;hp=a0598db270e64767f3432fd3ff5e18cf1d4601fe;hpb=c89ed16d24d56879bf40a70d500509d1d42a4532;p=quix0rs-gnu-social.git

diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index a0598db270..60f108dee3 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -40,17 +40,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
-class BlockedfromgroupAction extends GroupDesignAction
+class BlockedfromgroupAction extends GroupAction
 {
     var $page = null;
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -66,26 +65,25 @@ class BlockedfromgroupAction extends GroupDesignAction
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('blockedfromgroup', $args), 301);
-            return false;
         }
 
         if (!$nickname) {
+            // TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
             $this->clientError(_('No nickname.'), 404);
-            return false;
         }
 
-        $local = Local_group::staticGet('nickname', $nickname);
+        $local = Local_group::getKV('nickname', $nickname);
 
         if (!$local) {
+            // TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
-        $this->group = User_group::staticGet('id', $local->group_id);
+        $this->group = User_group::getKV('id', $local->group_id);
 
         if (!$this->group) {
+            // TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         return true;
@@ -94,33 +92,32 @@ class BlockedfromgroupAction extends GroupDesignAction
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Title for first page with list of users blocked from a group.
+            // TRANS: %s is a group nickname.
             return sprintf(_('%s blocked profiles'),
                            $this->group->nickname);
         } else {
+            // TRANS: Title for any but the first page with list of users blocked from a group.
+            // TRANS: %1$s is a group nickname, %2$d is a page number.
             return sprintf(_('%1$s blocked profiles, page %2$d'),
                            $this->group->nickname,
                            $this->page);
         }
     }
 
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showPage();
     }
 
     function showPageNotice()
     {
         $this->element('p', 'instructions',
+                       // TRANS: Instructions for list of users blocked from a group.
                        _('A list of the users blocked from joining this group.'));
     }
 
-    function showLocalNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
@@ -154,7 +151,7 @@ class GroupBlockList extends ProfileList
         $this->group = $group;
     }
 
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new GroupBlockListItem($profile, $this->group, $this->action);
     }
@@ -205,7 +202,6 @@ class GroupBlockListItem extends ProfileListItem
  *
  * @see      UnblockForm
  */
-
 class GroupUnblockForm extends Form
 {
     /**
@@ -234,7 +230,6 @@ class GroupUnblockForm extends Form
      * @param User_group    $group   group to block user from
      * @param array         $args    return-to args
      */
-
     function __construct($out=null, $profile=null, $group=null, $args=null)
     {
         parent::__construct($out);
@@ -249,7 +244,6 @@ class GroupUnblockForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         // This should be unique for the page.
@@ -261,7 +255,6 @@ class GroupUnblockForm extends Form
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_group_unblock';
@@ -272,7 +265,6 @@ class GroupUnblockForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('groupunblock');
@@ -285,6 +277,7 @@ class GroupUnblockForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for unblocking a user from a group.
         $this->out->element('legend', null, _('Unblock user from group'));
     }
 
@@ -293,7 +286,6 @@ class GroupUnblockForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->hidden('unblockto-' . $this->profile->id,
@@ -314,9 +306,14 @@ class GroupUnblockForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user'));
+        $this->out->submit('submit',
+                           // TRANS: Button text for unblocking a user from a group.
+                           _m('BUTTON','Unblock'),
+                           'submit',
+                           null,
+                           // TRANS: Tooltip for button for unblocking a user from a group.
+                           _('Unblock this user'));
     }
 }