Merge pull request #1165 from annando/1409-issue-1157

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index c86ca69bb9b738e46ec65cbb3dec95f963077a3e..b7148bb3605751c89dc71f064dfe94d2ba5cb812 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -16,10 +16,11 @@ function get_theme_config_file($theme){
 
 function settings_init(&$a) {
 
-       if (function_exists("apc_delete")) {
-               $toDelete = new APCIterator('user', APC_ITER_VALUE);
-               apc_delete($toDelete);
-       }
+       // APC deactivated, since there are problems with PHP 5.5
+       //if (function_exists("apc_delete")) {
+       //      $toDelete = new APCIterator('user', APC_ITER_VALUE);
+       //      apc_delete($toDelete);
+       //}
 
        // These lines provide the javascript needed by the acl selector
 
@@ -34,7 +35,7 @@ function settings_init(&$a) {
                array(
                        'label' => t('Account'),
                        'url'   => $a->get_baseurl(true).'/settings',
-                       'selected'      => (($a->argc == 1)?'active':''),
+                       'selected'      =>  (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
                ),
                array(
                        'label' => t('Additional features'),
@@ -60,7 +61,7 @@ function settings_init(&$a) {
                array(
                        'label' => t('Delegations'),
                        'url'   => $a->get_baseurl(true).'/delegate',
-                       'selected'      => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+                       'selected'      => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
                ),
                array(
                        'label' => t('Connected apps'),
@@ -70,12 +71,12 @@ function settings_init(&$a) {
                array(
                        'label' => t('Export personal data'),
                        'url' => $a->get_baseurl(true) . '/uexport',
-                       'selected' => ''
+                       'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
                ),
                array(
                        'label' => t('Remove account'),
                        'url' => $a->get_baseurl(true) . '/removeme',
-                       'selected' => ''
+                       'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
                )
        );
 
@@ -265,7 +266,9 @@ function settings_post(&$a) {
                $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme']))  : $a->user['theme']);
                $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme']))  : '');
                $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);
+               $noinfo = ((x($_POST,'noinfo')) ? intval($_POST['noinfo'])  : 0);
                $infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll'])  : 0);
+               $no_auto_update = ((x($_POST,'no_auto_update')) ? intval($_POST['no_auto_update'])  : 0);
                $browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
                $browser_update   = $browser_update * 1000;
                if($browser_update < 10000)
@@ -287,7 +290,9 @@ function settings_post(&$a) {
                set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
                set_pconfig(local_user(),'system','itemspage_mobile_network', $itemspage_mobile_network);
                set_pconfig(local_user(),'system','no_smilies',$nosmile);
+               set_pconfig(local_user(),'system','ignore_info',$noinfo);
                set_pconfig(local_user(),'system','infinite_scroll',$infinite_scroll);
+               set_pconfig(local_user(),'system','no_auto_update',$no_auto_update);
 
 
                if ($theme == $a->user['theme']){
@@ -850,9 +855,15 @@ function settings_content(&$a) {
                $nosmile = get_pconfig(local_user(),'system','no_smilies');
                $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
 
+               $noinfo = get_pconfig(local_user(),'system','ignore_info');
+               $noinfo = (($noinfo===false)? '0': $noinfo); // default if not set: 0
+
                $infinite_scroll = get_pconfig(local_user(),'system','infinite_scroll');
                $infinite_scroll = (($infinite_scroll===false)? '0': $infinite_scroll); // default if not set: 0
 
+               $no_auto_update = get_pconfig(local_user(),'system','no_auto_update');
+               $no_auto_update = (($no_auto_update===false)? '0': $no_auto_update); // default if not set: 0
+
                $theme_config = "";
                if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){
                        require_once($themeconfigfile);
@@ -873,7 +884,9 @@ function settings_content(&$a) {
                        '$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
                        '$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
                        '$nosmile'      => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
+                       '$noinfo'       => array('noinfo', t("Don't show notices"), $noinfo, ''),
                        '$infinite_scroll'      => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
+                       '$no_auto_update'       => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
 
                        '$theme_config' => $theme_config,
                ));
@@ -950,20 +963,22 @@ function settings_content(&$a) {
 
        $pageset_tpl = get_markup_template('pagetypes.tpl');
        $pagetype = replace_macros($pageset_tpl, array(
+               '$user'         => t("User Types"),
+               '$community'    => t("Community Types"),
                '$page_normal'  => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
                                                                        t('This account is a normal personal profile'),
                                                                        ($a->user['page-flags'] == PAGE_NORMAL)),
 
                '$page_soapbox'         => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
-                                                                       t('Automatically approve all connection/friend requests as read-only fans'), 
+                                                                       t('Automatically approve all connection/friend requests as read-only fans'),
                                                                        ($a->user['page-flags'] == PAGE_SOAPBOX)),
 
                '$page_community'       => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
-                                                                       t('Automatically approve all connection/friend requests as read-write fans'), 
+                                                                       t('Automatically approve all connection/friend requests as read-write fans'),
                                                                        ($a->user['page-flags'] == PAGE_COMMUNITY)),
 
                '$page_freelove'        => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
-                                                                       t('Automatically approve all connection/friend requests as friends'), 
+                                                                       t('Automatically approve all connection/friend requests as friends'),
                                                                        ($a->user['page-flags'] == PAGE_FREELOVE)),
 
                '$page_prvgroup'        => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,