harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add alt_pager to mod_moderate, remove legacy $a parameter from all occurrences of alt_pager

Browse Source
This commit is contained in:
zotlabs 2018-04-17 23:36:35 -07:00
parent fc7d9c235c
commit c53f788cc8
9 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Articles.php
View File

@ -191,7 +191,7 @@ class Articles extends \Zotlabs\Web\Controller {
'$title' => t('Articles'), '$title' => t('Articles'),
'$editor' => $editor, '$editor' => $editor,
'$content' => $content, '$content' => $content,
'$pager' => alt_pager($a,$pager_total) '$pager' => alt_pager($pager_total)
]); ]);
return $o; return $o;

2
Zotlabs/Module/Cards.php
View File

@ -194,7 +194,7 @@ class Cards extends \Zotlabs\Web\Controller {
'$title' => t('Cards'), '$title' => t('Cards'),
'$editor' => $editor, '$editor' => $editor,
'$content' => $content, '$content' => $content,
'$pager' => alt_pager($a, $pager_total) '$pager' => alt_pager($pager_total)
]); ]);
return $o; return $o;

2
Zotlabs/Module/Channel.php
View File

@ -380,7 +380,7 @@ class Channel extends \Zotlabs\Web\Controller {
} }
if((! $update) || ($checkjs->disabled())) { if((! $update) || ($checkjs->disabled())) {
$o .= alt_pager($a,count($items)); $o .= alt_pager(count($items));
if ($mid && $items[0]['title']) if ($mid && $items[0]['title'])
\App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title']; \App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
} }

2
Zotlabs/Module/Directory.php
View File

@ -404,7 +404,7 @@ class Directory extends \Zotlabs\Web\Controller {
'$entries' => $entries, '$entries' => $entries,
'$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle, '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle,
'$submit' => t('Find'), '$submit' => t('Find'),
'$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')), '$next' => alt_pager($j['records'], t('next page'), t('previous page')),
'$sort' => t('Sort options'), '$sort' => t('Sort options'),
'$normal' => t('Alphabetic'), '$normal' => t('Alphabetic'),
'$reverse' => t('Reverse Alphabetic'), '$reverse' => t('Reverse Alphabetic'),

2
Zotlabs/Module/Message.php
View File

@ -93,7 +93,7 @@ class Message extends \Zotlabs\Web\Controller {
)); ));
$o .= alt_pager($a,count($r)); $o .= alt_pager(count($r));
return $o; return $o;

8
Zotlabs/Module/Moderate.php
View File

@ -14,9 +14,12 @@ class Moderate extends \Zotlabs\Web\Controller {
return; return;
} }
\App::set_pager_itemspage(60);
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
//show all items //show all items
if(argc() == 1) { if(argc() == 1) {
$r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60", $r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc $pager_sql",
intval(local_channel()), intval(local_channel()),
intval(ITEM_MODERATED) intval(ITEM_MODERATED)
); );
@ -26,7 +29,7 @@ class Moderate extends \Zotlabs\Web\Controller {
if(argc() == 2) { if(argc() == 2) {
$post_id = intval(argv(1)); $post_id = intval(argv(1));
$r = q("select item.id as item_id, item.* from item where item.id = %d and item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60", $r = q("select item.id as item_id, item.* from item where item.id = %d and item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc $pager_sql",
intval($post_id), intval($post_id),
intval(local_channel()), intval(local_channel()),
intval(ITEM_MODERATED) intval(ITEM_MODERATED)
@ -92,6 +95,7 @@ class Moderate extends \Zotlabs\Web\Controller {
} }
$o = conversation($items,'moderate',false,'traditional'); $o = conversation($items,'moderate',false,'traditional');
$o .= alt_pager(count($items));
return $o; return $o;
} }

2
Zotlabs/Module/Network.php
View File

@ -565,7 +565,7 @@ class Network extends \Zotlabs\Web\Controller {
$o .= conversation($items,$mode,$update,$page_mode); $o .= conversation($items,$mode,$update,$page_mode);
if(($items) && (! $update)) if(($items) && (! $update))
$o .= alt_pager($a,count($items)); $o .= alt_pager(count($items));
return $o; return $o;
} }

2
Zotlabs/Module/Pubstream.php
View File

@ -279,7 +279,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
$o .= '<div id="content-complete"></div>'; $o .= '<div id="content-complete"></div>';
if(($items) && (! $update)) if(($items) && (! $update))
$o .= alt_pager($a,count($items)); $o .= alt_pager(count($items));
return $o; return $o;

2
include/text.php
View File

@ -531,7 +531,7 @@ function paginate(&$a) {
} }
function alt_pager(&$a, $i, $more = '', $less = '') { function alt_pager($i, $more = '', $less = '') {
if(! $more) if(! $more)
$more = t('older'); $more = t('older');