allow user to set number of items to show on network page

diff --git a/mod/network.php b/mod/network.php
index 27c6e315b81fc05fc48a0bca9012507e614e245d..b04a7b489013153999a8a9d47c21d7458580e8c3 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -403,7 +403,8 @@ function network_content(&$a, $update = 0) {
 
                if(count($r)) {
                        $a->set_pager_total($r[0]['total']);
-                       $a->set_pager_itemspage(40);
+                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                        $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
                }
                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
        }

diff --git a/mod/settings.php b/mod/settings.php
index a9d00bc981e767449e0df2e3b3d2d8df50abab6b..2ef582fdfeec84b9f760a287716fd54208da98dd 100755 (executable)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -237,6 +237,10 @@ function settings_post(&$a) {
        if($browser_update < 10000)
                $browser_update = 40000;
 
+       $itemspage_network   = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
+       if($itemspage_network > 100)
+                $itemspage_network = 40;
+
 
        $allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
        $publish          = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
@@ -331,6 +335,7 @@ function settings_post(&$a) {
 
        set_pconfig(local_user(),'system','suggestme', $suggestme);
        set_pconfig(local_user(),'system','update_interval', $browser_update);
+       set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
 
        $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d  WHERE `uid` = %d LIMIT 1",
                        dbesc($username),
@@ -648,6 +653,9 @@ function settings_content(&$a) {
 
        $browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
        $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
+
+       $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
+       $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
        
        if(! strlen($a->user['timezone']))
                $timezone = date_default_timezone_get();
@@ -814,6 +822,7 @@ function settings_content(&$a) {
                '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
                '$theme'        => array('theme', t('Display Theme:'), $theme_selected, '', $themes),
                '$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
+               '$itemspage_network'   => array('itemspage_network',  t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
 
                '$h_prv'        => t('Security and Privacy Settings'),
 

diff --git a/view/settings.tpl b/view/settings.tpl
index b7f427b32488887d0096972f5d5a1fd10fd3c89b..46c737b23a70986b418eeb1a77db2fabfe6d2f91 100755 (executable)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -30,6 +30,7 @@ $nickname_block
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 {{inc field_select.tpl with $field=$theme }}{{endinc}}
 {{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >