Added getBytesFromShorthand at the remaining places.

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

diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index fe42b8718d3720ab5d1abc81786ea564b15a1aa6..11c3f51393ad3fd9a207700ee3c7c9923768e6be 100644 (file)
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -23,7 +23,6 @@ namespace Friendica\Module\Settings;
 
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -44,7 +43,7 @@ class Display extends BaseSettings
 
                self::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
 
-               $user = User::getById(local_user());
+               $user = User::getById(DI::userSession()->getLocalUserId());
 
                $theme                  = !empty($_POST['theme'])                  ? trim($_POST['theme'])                : $user['theme'];
                $mobile_theme           = !empty($_POST['mobile_theme'])           ? trim($_POST['mobile_theme'])         : '';
@@ -78,20 +77,20 @@ class Display extends BaseSettings
                }
 
                if ($mobile_theme !== '') {
-                       DI::pConfig()->set(local_user(), 'system', 'mobile_theme', $mobile_theme);
+                       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'mobile_theme', $mobile_theme);
                }
 
-               DI::pConfig()->set(local_user(), 'system', 'itemspage_network'       , $itemspage_network);
-               DI::pConfig()->set(local_user(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
-               DI::pConfig()->set(local_user(), 'system', 'update_interval'         , $browser_update);
-               DI::pConfig()->set(local_user(), 'system', 'no_auto_update'          , $no_auto_update);
-               DI::pConfig()->set(local_user(), 'system', 'no_smilies'              , !$enable_smile);
-               DI::pConfig()->set(local_user(), 'system', 'infinite_scroll'         , $infinite_scroll);
-               DI::pConfig()->set(local_user(), 'system', 'no_smart_threading'      , !$enable_smart_threading);
-               DI::pConfig()->set(local_user(), 'system', 'hide_dislike'            , !$enable_dislike);
-               DI::pConfig()->set(local_user(), 'system', 'display_resharer'        , $display_resharer);
-               DI::pConfig()->set(local_user(), 'system', 'stay_local'              , $stay_local);
-               DI::pConfig()->set(local_user(), 'system', 'first_day_of_week'       , $first_day_of_week);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network'       , $itemspage_network);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'update_interval'         , $browser_update);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'no_auto_update'          , $no_auto_update);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'no_smilies'              , !$enable_smile);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'infinite_scroll'         , $infinite_scroll);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'no_smart_threading'      , !$enable_smart_threading);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'hide_dislike'            , !$enable_dislike);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'display_resharer'        , $display_resharer);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'stay_local'              , $stay_local);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'first_day_of_week'       , $first_day_of_week);
 
                if (in_array($theme, Theme::getAllowedList())) {
                        if ($theme == $user['theme']) {
@@ -101,7 +100,7 @@ class Display extends BaseSettings
                                        theme_post(DI::app());
                                }
                        } else {
-                               DBA::update('user', ['theme' => $theme], ['uid' => local_user()]);
+                               DBA::update('user', ['theme' => $theme], ['uid' => DI::userSession()->getLocalUserId()]);
                        }
                } else {
                        DI::sysmsg()->addNotice(DI::l10n()->t('The theme you chose isn\'t available.'));
@@ -116,7 +115,7 @@ class Display extends BaseSettings
        {
                parent::content();
 
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
                }
 
@@ -130,7 +129,7 @@ class Display extends BaseSettings
                        $default_mobile_theme = 'none';
                }
 
-               $user = User::getById(local_user());
+               $user = User::getById(DI::userSession()->getLocalUserId());
 
                $allowed_themes = Theme::getAllowedList();
 
@@ -157,28 +156,28 @@ class Display extends BaseSettings
                }
 
                $theme_selected        = $user['theme'] ?: $default_theme;
-               $mobile_theme_selected = Session::get('mobile-theme', $default_mobile_theme);
+               $mobile_theme_selected = DI::session()->get('mobile-theme', $default_mobile_theme);
 
-               $itemspage_network = intval(DI::pConfig()->get(local_user(), 'system', 'itemspage_network'));
+               $itemspage_network = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network'));
                $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : DI::config()->get('system', 'itemspage_network'));
-               $itemspage_mobile_network = intval(DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network'));
+               $itemspage_mobile_network = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network'));
                $itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : DI::config()->get('system', 'itemspage_network_mobile'));
 
-               $browser_update = intval(DI::pConfig()->get(local_user(), 'system', 'update_interval'));
+               $browser_update = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'update_interval'));
                if (intval($browser_update) != -1) {
                        $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
                }
 
-               $no_auto_update         = DI::pConfig()->get(local_user(), 'system', 'no_auto_update', 0);
-               $enable_smile           = !DI::pConfig()->get(local_user(), 'system', 'no_smilies', 0);
-               $infinite_scroll        = DI::pConfig()->get(local_user(), 'system', 'infinite_scroll', 0);
-               $enable_smart_threading = !DI::pConfig()->get(local_user(), 'system', 'no_smart_threading', 0);
-               $enable_dislike         = !DI::pConfig()->get(local_user(), 'system', 'hide_dislike', 0);
-               $display_resharer       = DI::pConfig()->get(local_user(), 'system', 'display_resharer', 0);
-               $stay_local             = DI::pConfig()->get(local_user(), 'system', 'stay_local', 0);
+               $no_auto_update         =  DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_auto_update', 0);
+               $enable_smile           = !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_smilies', 0);
+               $infinite_scroll        =  DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'infinite_scroll', 0);
+               $enable_smart_threading = !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_smart_threading', 0);
+               $enable_dislike         = !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'hide_dislike', 0);
+               $display_resharer       =  DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_resharer', 0);
+               $stay_local             =  DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'stay_local', 0);
 
 
-               $first_day_of_week = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0);
+               $first_day_of_week = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'first_day_of_week', 0);
                $weekdays = [
                        0 => DI::l10n()->t("Sunday"),
                        1 => DI::l10n()->t("Monday"),
@@ -207,7 +206,7 @@ class Display extends BaseSettings
 
                        '$form_security_token' => self::getFormSecurityToken('settings_display'),
                        '$baseurl' => DI::baseUrl()->get(true),
-                       '$uid'     => local_user(),
+                       '$uid'     => DI::userSession()->getLocalUserId(),
 
                        '$theme'            => ['theme', DI::l10n()->t('Display Theme:'), $theme_selected, '', $themes, true],
                        '$mobile_theme' => ['mobile_theme', DI::l10n()->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false],