Merge pull request #1121 from Beanow/hotfix/bug-1105

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 2519928b6da0a3f79972e97d0dc991796e0ce9af..ae4c36e0cc0be0e2df3778daeaff4916a1f51ad9 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
 
@@ -267,6 +268,7 @@ function settings_post(&$a) {
                $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)
@@ -290,6 +292,7 @@ function settings_post(&$a) {
                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']){
@@ -858,6 +861,9 @@ function settings_content(&$a) {
                $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);
@@ -880,6 +886,7 @@ function settings_content(&$a) {
                        '$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,
                ));
@@ -956,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,