starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty groups list when selecting active/inactive groups

Browse Source
This commit is contained in:
DariusIII
2017-03-22 09:09:34 +01:00
parent 89509a4f24
commit 7aa97d3ebe
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+2
View File
@@ -1,3 +1,5 @@
2017-03-22 DariusIII
* Fix: Fix empty groups list when selecting active/inactive groups
2017-03-21 DariusIII
* Chg: Add jquery-goup script to composer
* Chg: Update forums with coloured roles
nntmux/Groups.php
+3 -3
View File
@@ -216,7 +216,7 @@ class Groups
)
: ''
),
($active > -1 ? 'AND g.active = {$active}' : '')
($active > -1 ? sprintf('AND g.active = %d', $active) : '')
), true, NN_CACHE_EXPIRY_MEDIUM
);
@@ -253,8 +253,8 @@ class Groups
)
: ''
),
($active > -1 ? 'AND g.active = {$active}' : ''),
($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
$active > -1 ? sprintf('AND g.active = %d', $active) : '',
$start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start
), true, NN_CACHE_EXPIRY_SHORT
);
}
www/admin/group-list-active.php
+8 -8
View File
@@ -7,31 +7,31 @@ use nntmux\Groups;
$page = new AdminPage();
$groups = new Groups(['Settings' => $page->settings]);
$gname = "";
if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
$gname = '';
if (!empty($_REQUEST['groupname'])) {
$gname = $_REQUEST['groupname'];
}
$groupcount = $groups->getCount($gname, 1);
$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
$offset = $_REQUEST['offset'] ?? 0;
$groupname = !empty($_REQUEST['groupname']) ? $_REQUEST['groupname'] : '';
$page->smarty->assign('groupname',$groupname);
$page->smarty->assign('pagertotalitems',$groupcount);
$page->smarty->assign('pageroffset',$offset);
$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
$groupsearch = ($gname != "") ? 'groupname='.$gname.'&' : '';
$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list-active.php?".$groupsearch."offset=");
$pager = $page->smarty->fetch("pager.tpl");
$groupsearch = $gname != '' ? 'groupname='.$gname.'&' : '';
$page->smarty->assign('pagerquerybase', WWW_TOP.'/group-list-active.php?'.$groupsearch.'offset=');
$pager = $page->smarty->fetch('pager.tpl');
$page->smarty->assign('pager', $pager);
$grouplist = $groups->getRange($offset, ITEMS_PER_PAGE, $gname, 1);
$page->smarty->assign('grouplist',$grouplist);
$page->title = "Group List";
$page->title = 'Group List';
$page->content = $page->smarty->fetch('group-list.tpl');
$page->render();
www/admin/group-list-inactive.php
+8 -8
View File
@@ -7,31 +7,31 @@ use nntmux\Groups;
$page = new AdminPage();
$groups = new Groups(['Settings' => $page->settings]);
$gname = "";
if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
$gname = '';
if (!empty($_REQUEST['groupname'])) {
$gname = $_REQUEST['groupname'];
}
$groupcount = $groups->getCount($gname, 0);
$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
$offset = $_REQUEST['offset'] ?? 0;
$groupname = !empty($_REQUEST['groupname']) ? $_REQUEST['groupname'] : '';
$page->smarty->assign('groupname',$groupname);
$page->smarty->assign('pagertotalitems',$groupcount);
$page->smarty->assign('pageroffset',$offset);
$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
$groupsearch = ($gname != "") ? 'groupname='.$gname.'&' : '';
$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list-inactive.php?".$groupsearch."offset=");
$pager = $page->smarty->fetch("pager.tpl");
$groupsearch = $gname != '' ? 'groupname='.$gname.'&' : '';
$page->smarty->assign('pagerquerybase', WWW_TOP.'/group-list-inactive.php?'.$groupsearch.'offset=');
$pager = $page->smarty->fetch('pager.tpl');
$page->smarty->assign('pager', $pager);
$grouplist = $groups->getRange($offset, ITEMS_PER_PAGE, $gname, 0);
$page->smarty->assign('grouplist',$grouplist);
$page->title = "Group List";
$page->title = 'Group List';
$page->content = $page->smarty->fetch('group-list.tpl');
$page->render();