From aa2f09fa3cd42f73d0f376b46c200b5730a2711e Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 5 May 2020 16:49:21 +0300 Subject: [PATCH] [UI] Fix group member pages showing up twice --- actions/groupmembers.php | 99 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/actions/groupmembers.php b/actions/groupmembers.php index d8b2a1e7f3..128e68fa7f 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -1,85 +1,82 @@ . + /** - * StatusNet, the distributed open-source microblogging tool - * * List of group members * - * PHP version 5 - * - * LICENCE: 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * * @category Group - * @package StatusNet + * @package GNUsocial * @author Evan Prodromou * @copyright 2008-2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -if (!defined('GNUSOCIAL')) { exit(1); } +defined('GNUSOCIAL') || die(); /** * List of group members * - * @category Group - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * @category Group + * @package GNUsocial + * @author Evan Prodromou + * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ class GroupmembersAction extends GroupAction { - var $page = null; + public $page = null; - function isReadOnly($args) + public function isReadOnly($args) { return true; } - function title() + public function title() { if ($this->page == 1) { // TRANS: Title of the page showing group members. // TRANS: %s is the name of the group. - return sprintf(_('%s group members'), - $this->group->nickname); + return sprintf( + _('%s group members'), + $this->group->nickname + ); } else { // TRANS: Title of the page showing group members. // TRANS: %1$s is the name of the group, %2$d is the page number of the members list. - return sprintf(_('%1$s group members, page %2$d'), - $this->group->nickname, - $this->page); + return sprintf( + _('%1$s group members, page %2$d'), + $this->group->nickname, + $this->page + ); } } - protected function handle() + public function showPageNotice() { - parent::handle(); - $this->showPage(); + $this->element( + 'p', + 'instructions', + // TRANS: Page notice for group members page. + _('A list of the users in this group.') + ); } - function showPageNotice() - { - $this->element('p', 'instructions', - // TRANS: Page notice for group members page. - _('A list of the users in this group.')); - } - - function showContent() + public function showContent() { $offset = ($this->page-1) * PROFILES_PER_PAGE; - $limit = PROFILES_PER_PAGE + 1; + $limit = PROFILES_PER_PAGE + 1; $cnt = 0; @@ -90,8 +87,12 @@ class GroupmembersAction extends GroupAction $cnt = $member_list->show(); } - $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, - $this->page, 'groupmembers', - array('nickname' => $this->group->nickname)); + $this->pagination( + $this->page > 1, + $cnt > PROFILES_PER_PAGE, + $this->page, + 'groupmembers', + ['nickname' => $this->group->nickname] + ); } }