Merge pull request #8210 from nupplaphil/task/mod_fsuggest

[friendica.git] / src / Module / Admin / Themes / Details.php

diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php
index 3750e96070ad9fd7514f63f34c8adc1c3f49ef76..a1617954f10bf5d8b99e4e349f26a214553fb4ae 100644 (file)
--- a/src/Module/Admin/Themes/Details.php
+++ b/src/Module/Admin/Themes/Details.php
@@ -3,19 +3,19 @@
 namespace Friendica\Module\Admin\Themes;
 
 use Friendica\Content\Text\Markdown;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
-use Friendica\Module\BaseAdminModule;
+use Friendica\DI;
+use Friendica\Module\BaseAdmin;
 use Friendica\Util\Strings;
 
-class Details extends BaseAdminModule
+class Details extends BaseAdmin
 {
-       public static function post()
+       public static function post(array $parameters = [])
        {
-               parent::post();
+               parent::post($parameters);
 
-               $a = self::getApp();
+               $a = DI::app();
 
                if ($a->argc > 2) {
                        // @TODO: Replace with parameter from router
@@ -29,38 +29,38 @@ class Details extends BaseAdminModule
                                }
                        }
 
-                       info(L10n::t('Theme settings updated.'));
+                       info(DI::l10n()->t('Theme settings updated.'));
 
-                       if ($a->isAjax()) {
+                       if (DI::mode()->isAjax()) {
                                return;
                        }
 
-                       $a->internalRedirect('admin/themes/' . $theme);
+                       DI::baseUrl()->redirect('admin/themes/' . $theme);
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
-               parent::content();
+               parent::content($parameters);
 
-               $a = self::getApp();
+               $a = DI::app();
 
                if ($a->argc > 2) {
                        // @TODO: Replace with parameter from router
                        $theme = $a->argv[2];
                        $theme = Strings::sanitizeFilePathItem($theme);
                        if (!is_dir("view/theme/$theme")) {
-                               notice(L10n::t("Item not found."));
+                               notice(DI::l10n()->t("Item not found."));
                                return '';
                        }
 
                        $isEnabled = in_array($theme, Theme::getAllowedList());
                        if ($isEnabled) {
                                $status = "on";
-                               $action = L10n::t("Disable");
+                               $action = DI::l10n()->t("Disable");
                        } else {
                                $status = "off";
-                               $action = L10n::t("Enable");
+                               $action = DI::l10n()->t("Enable");
                        }
 
                        if (!empty($_GET['action']) && $_GET['action'] == 'toggle') {
@@ -68,14 +68,14 @@ class Details extends BaseAdminModule
 
                                if ($isEnabled) {
                                        Theme::uninstall($theme);
-                                       info(L10n::t('Theme %s disabled.', $theme));
+                                       info(DI::l10n()->t('Theme %s disabled.', $theme));
                                } elseif (Theme::install($theme)) {
-                                       info(L10n::t('Theme %s successfully enabled.', $theme));
+                                       info(DI::l10n()->t('Theme %s successfully enabled.', $theme));
                                } else {
-                                       info(L10n::t('Theme %s failed to install.', $theme));
+                                       info(DI::l10n()->t('Theme %s failed to install.', $theme));
                                }
 
-                               $a->internalRedirect('admin/themes/' . $theme);
+                               DI::baseUrl()->redirect('admin/themes/' . $theme);
                        }
 
                        $readme = null;
@@ -94,26 +94,26 @@ class Details extends BaseAdminModule
                                }
                        }
 
-                       $screenshot = [Theme::getScreenshot($theme), L10n::t('Screenshot')];
+                       $screenshot = [Theme::getScreenshot($theme), DI::l10n()->t('Screenshot')];
                        if (!stristr($screenshot[0], $theme)) {
                                $screenshot = null;
                        }
 
                        $t = Renderer::getMarkupTemplate('admin/addons/details.tpl');
                        return Renderer::replaceMacros($t, [
-                               '$title' => L10n::t('Administration'),
-                               '$page' => L10n::t('Themes'),
-                               '$toggle' => L10n::t('Toggle'),
-                               '$settings' => L10n::t('Settings'),
-                               '$baseurl' => $a->getBaseURL(true),
+                               '$title' => DI::l10n()->t('Administration'),
+                               '$page' => DI::l10n()->t('Themes'),
+                               '$toggle' => DI::l10n()->t('Toggle'),
+                               '$settings' => DI::l10n()->t('Settings'),
+                               '$baseurl' => DI::baseUrl()->get(true),
                                '$addon' => $theme,
                                '$status' => $status,
                                '$action' => $action,
                                '$info' => Theme::getInfo($theme),
                                '$function' => 'themes',
                                '$admin_form' => $admin_form,
-                               '$str_author' => L10n::t('Author: '),
-                               '$str_maintainer' => L10n::t('Maintainer: '),
+                               '$str_author' => DI::l10n()->t('Author: '),
+                               '$str_maintainer' => DI::l10n()->t('Maintainer: '),
                                '$screenshot' => $screenshot,
                                '$readme' => $readme,
 
@@ -121,6 +121,6 @@ class Details extends BaseAdminModule
                        ]);
                }
 
-               $a->internalRedirect('admin/themes');
+               DI::baseUrl()->redirect('admin/themes');
        }
 }