Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / view / theme / duepuntozero / config.php

diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index d8323225d5bf1399d2999e36022786d667f5a46a..7d2c3f425685ebfdcab4c50689dab3cdc2ba6c84 100644 (file)
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -4,10 +4,8 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function theme_content(App $a)
 {
@@ -15,7 +13,7 @@ function theme_content(App $a)
                return;
        }
 
-       $colorset = PConfig::get(local_user(), 'duepuntozero', 'colorset');
+       $colorset = DI::pConfig()->get(local_user(), 'duepuntozero', 'colorset');
        $user = true;
 
        return clean_form($a, $colorset, $user);
@@ -28,13 +26,13 @@ function theme_post(App $a)
        }
 
        if (isset($_POST['duepuntozero-settings-submit'])) {
-               PConfig::set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+               DI::pConfig()->set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
        }
 }
 
 function theme_admin(App $a)
 {
-       $colorset = Config::get('duepuntozero', 'colorset');
+       $colorset = DI::config()->get('duepuntozero', 'colorset');
        $user = false;
 
        return clean_form($a, $colorset, $user);
@@ -43,7 +41,7 @@ function theme_admin(App $a)
 function theme_admin_post(App $a)
 {
        if (isset($_POST['duepuntozero-settings-submit'])) {
-               Config::set('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+               DI::config()->set('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
        }
 }
 
@@ -51,27 +49,26 @@ function theme_admin_post(App $a)
 function clean_form(App $a, &$colorset, $user)
 {
        $colorset = [
-               'default'     => L10n::t('default'),
-               'greenzero'   => L10n::t('greenzero'),
-               'purplezero'  => L10n::t('purplezero'),
-               'easterbunny' => L10n::t('easterbunny'),
-               'darkzero'    => L10n::t('darkzero'),
-               'comix'       => L10n::t('comix'),
-               'slackr'      => L10n::t('slackr'),
+               'default'     => DI::l10n()->t('default'),
+               'greenzero'   => DI::l10n()->t('greenzero'),
+               'purplezero'  => DI::l10n()->t('purplezero'),
+               'easterbunny' => DI::l10n()->t('easterbunny'),
+               'darkzero'    => DI::l10n()->t('darkzero'),
+               'comix'       => DI::l10n()->t('comix'),
+               'slackr'      => DI::l10n()->t('slackr'),
        ];
 
        if ($user) {
-               $color = PConfig::get(local_user(), 'duepuntozero', 'colorset');
+               $color = DI::pConfig()->get(local_user(), 'duepuntozero', 'colorset');
        } else {
-               $color = Config::get('duepuntozero', 'colorset');
+               $color = DI::config()->get('duepuntozero', 'colorset');
        }
 
-       $t = get_markup_template("theme_settings.tpl");
-       $o = replace_macros($t, [
-               '$submit'   => L10n::t('Submit'),
-               '$baseurl'  => System::baseUrl(),
-               '$title'    => L10n::t("Theme settings"),
-               '$colorset' => ['duepuntozero_colorset', L10n::t('Variations'), $color, '', $colorset],
+       $t = Renderer::getMarkupTemplate("theme_settings.tpl");
+       $o = Renderer::replaceMacros($t, [
+               '$submit'   => DI::l10n()->t('Submit'),
+               '$title'    => DI::l10n()->t("Theme settings"),
+               '$colorset' => ['duepuntozero_colorset', DI::l10n()->t('Variations'), $color, '', $colorset],
        ]);
 
        return $o;