Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 21:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add node-wide default items per page config

Browse source
This commit is contained in:
Hypolite Petovan 2020-02-16 13:04:26 -05:00
parent efbafce2d5
commit e0d03615bc
9 changed files with 66 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Module/BaseSearch.php
View file

@ -81,7 +81,15 @@ class BaseSearch extends BaseModule
$header = DI::l10n()->t('Forum Search - %s', $search);
}
$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
if (DI::mode()->isMobile()) {
$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
} else {
$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
DI::config()->get('system', 'itemspage_network'));
}
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
if ($localSearch && empty($results)) {
$pager->setItemsPerPage(80);

8
src/Module/Conversation/Community.php
View file

@ -195,11 +195,12 @@ class Community extends BaseModule
}
}
// check if we serve a mobile device and get the user settings accordingly
if (DI::mode()->isMobile()) {
self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', 20);
self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
} else {
self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', 40);
self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
DI::config()->get('system', 'itemspage_network'));
}
// now that we have the user settings, see if the theme forces
@ -272,6 +273,7 @@ class Community extends BaseModule
* @param $itemspage
* @return array
* @throws \Exception
* @TODO Move to repository/factory
*/
private static function selectItems($since_id, $max_id, $itemspage)
{

8
src/Module/Profile/Status.php
View file

@ -166,12 +166,12 @@ class Status extends BaseProfile
$sql_extra3 = "";
}
// check if we serve a mobile device and get the user settings
// accordingly
if (DI::mode()->isMobile()) {
$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', 10);
$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
} else {
$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', 20);
$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
DI::config()->get('system', 'itemspage_network'));
}
// now that we have the user settings, see if the theme forces

10
src/Module/Search/Index.php
View file

@ -137,7 +137,15 @@ class Index extends BaseSearch
// OR your own posts if you are a logged in member
// No items will be shown if the member has a blocked profile wall.
$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
if (DI::mode()->isMobile()) {
$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
} else {
$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
DI::config()->get('system', 'itemspage_network'));
}
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
if ($tag) {
Logger::info('Start tag search.', ['q' => $search]);