Merge pull request #12820 from MrPetovan/bug/fatal-errors

[friendica.git] / src / Module / Settings / Display.php

diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index c349098aa0aac5f2154adc8dc1a326b01c109427..d24a8e10d4d39afb4be8ac652694cc1785fca7d7 100644 (file)
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -79,7 +79,6 @@ class Display extends BaseSettings
                $first_day_of_week      = !empty($request['first_day_of_week'])      ? intval($request['first_day_of_week'])      : 0;
                $calendar_default_view  = !empty($request['calendar_default_view'])  ? trim($request['calendar_default_view'])    : 'month';
                $infinite_scroll        = !empty($request['infinite_scroll'])        ? intval($request['infinite_scroll'])        : 0;
-               $no_auto_update         = !empty($request['no_auto_update'])         ? intval($request['no_auto_update'])         : 0;
                $enable_smart_threading = !empty($request['enable_smart_threading']) ? intval($request['enable_smart_threading']) : 0;
                $enable_dislike         = !empty($request['enable_dislike'])         ? intval($request['enable_dislike'])         : 0;
                $display_resharer       = !empty($request['display_resharer'])       ? intval($request['display_resharer'])       : 0;
@@ -113,7 +112,6 @@ class Display extends BaseSettings
                $this->pConfig->set($uid, 'system', 'itemspage_network'       , $itemspage_network);
                $this->pConfig->set($uid, 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
                $this->pConfig->set($uid, 'system', 'update_interval'         , $browser_update);
-               $this->pConfig->set($uid, 'system', 'no_auto_update'          , $no_auto_update);
                $this->pConfig->set($uid, 'system', 'no_smilies'              , !$enable_smile);
                $this->pConfig->set($uid, 'system', 'infinite_scroll'         , $infinite_scroll);
                $this->pConfig->set($uid, 'system', 'no_smart_threading'      , !$enable_smart_threading);
@@ -202,7 +200,6 @@ class Display extends BaseSettings
                        $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
                }
 
-               $no_auto_update         =  $this->pConfig->get($uid, 'system', 'no_auto_update', 0);
                $enable_smile           = !$this->pConfig->get($uid, 'system', 'no_smilies', 0);
                $infinite_scroll        =  $this->pConfig->get($uid, 'system', 'infinite_scroll', 0);
                $enable_smart_threading = !$this->pConfig->get($uid, 'system', 'no_smart_threading', 0);
@@ -219,7 +216,7 @@ class Display extends BaseSettings
                ];
 
 
-               $first_day_of_week = $this->pConfig->get($uid, 'system', 'first_day_of_week', 0);
+               $first_day_of_week = $this->pConfig->get($uid, 'calendar', 'first_day_of_week', 0);
                $weekdays          = [
                        0 => $this->t('Sunday'),
                        1 => $this->t('Monday'),
@@ -255,7 +252,6 @@ class Display extends BaseSettings
                        '$calendar_title' => $this->t('Calendar'),
 
                        '$form_security_token' => self::getFormSecurityToken('settings_display'),
-                       '$baseurl'             => $this->baseUrl->get(true),
                        '$uid'                 => $uid,
 
                        '$theme'            => ['theme', $this->t('Display Theme:'), $theme_selected, '', $themes, true],
@@ -265,14 +261,13 @@ class Display extends BaseSettings
                        '$itemspage_network'        => ['itemspage_network'       , $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')],
                        '$itemspage_mobile_network' => ['itemspage_mobile_network', $this->t('Number of items to display per page when viewed from mobile device:'), $itemspage_mobile_network, $this->t('Maximum of 100 items')],
                        '$ajaxint'                  => ['browser_update'          , $this->t('Update browser every xx seconds'), $browser_update, $this->t('Minimum of 10 seconds. Enter -1 to disable it.')],
-                       '$no_auto_update'           => ['no_auto_update'          , $this->t('Automatic updates only at the top of the post stream pages'), $no_auto_update, $this->t('Auto update may add new posts at the top of the post stream pages, which can affect the scroll position and perturb normal reading if it happens anywhere else the top of the page.')],
                        '$enable_smile'             => ['enable_smile'            , $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')],
                        '$infinite_scroll'          => ['infinite_scroll'         , $this->t('Infinite scroll'), $infinite_scroll, $this->t('Automatic fetch new items when reaching the page end.')],
                        '$enable_smart_threading'   => ['enable_smart_threading'  , $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')],
                        '$enable_dislike'           => ['enable_dislike'          , $this->t('Display the Dislike feature'), $enable_dislike, $this->t('Display the Dislike button and dislike reactions on posts and comments.')],
                        '$display_resharer'         => ['display_resharer'        , $this->t('Display the resharer'), $display_resharer, $this->t('Display the first resharer as icon and text on a reshared item.')],
                        '$stay_local'               => ['stay_local'              , $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")],
-                       '$preview_mode'             => ['preview_mode'            , $this->t('Link preview mode'), $preview_mode, 'Appearance of the link preview that is added to each post with a link.', $preview_modes, false],
+                       '$preview_mode'             => ['preview_mode'            , $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false],
 
                        '$first_day_of_week'     => ['first_day_of_week'    , $this->t('Beginning of week:')    , $first_day_of_week    , '', $weekdays     , false],
                        '$calendar_default_view' => ['calendar_default_view', $this->t('Default calendar view:'), $calendar_default_view, '', $calendarViews, false],