Internal: Remove ChamiloApi::getEditorDocStylePath - refs BT#21621

1 year ago · 193763e905
parent 95625a93a8
commit 193763e905
5 changed files with 12 additions and 22 deletions
--- a/public/plugin/ai_helper/tool/learnpath.php
+++ b/public/plugin/ai_helper/tool/learnpath.php
@ -5,7 +5,7 @@
 Create a learnpath with contents based on existing knowledge.
 */

-use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
+use Chamilo\CoreBundle\Framework\Container;

 require_once __DIR__.'/../../../main/inc/global.inc.php';
 require_once __DIR__.'/../AiHelperPlugin.php';
@ -49,7 +49,7 @@ switch ($apiName) {
        if (!empty($resultText)) {
            $style = api_get_css_asset('bootstrap/dist/css/bootstrap.min.css');
            $style .= api_get_css_asset('fontawesome/css/font-awesome.min.css');
-            $style .= api_get_css(ChamiloApi::getEditorDocStylePath());
+            $style .= Container::getThemeHelper()->getThemeAssetLinkTag('document.css');
            $style .= api_get_css_asset('ckeditor/plugins/codesnippet/lib/highlight/styles/default.css');
            $style .= api_get_asset('ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js');
            $style .= '<script>hljs.initHighlightingOnLoad();</script>';
--- a/public/plugin/migrationmoodle/src/Transformer/Property/WrapHtmlReplacingFilePaths.php
+++ b/public/plugin/migrationmoodle/src/Transformer/Property/WrapHtmlReplacingFilePaths.php
@ -3,7 +3,7 @@

 namespace Chamilo\PluginBundle\MigrationMoodle\Transformer\Property;

-use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
+use Chamilo\CoreBundle\Framework\Container;

 /**
 * Class WrapHtmlReplacingFilePaths.
@ -27,7 +27,7 @@ class WrapHtmlReplacingFilePaths extends ReplaceFilePaths

        $style = api_get_css_asset('bootstrap/dist/css/bootstrap.min.css');
        $style .= api_get_css_asset('fontawesome/css/font-awesome.min.css');
-        $style .= api_get_css(ChamiloApi::getEditorDocStylePath());
+        $style .= Container::getThemeHelper()->getThemeAssetLinkTag('document.css');

        $content = "<!DOCTYPE html><head>$style</head><body>$content</body>";

--- a/src/CoreBundle/Component/Editor/CkEditor/CkEditor.php
+++ b/src/CoreBundle/Component/Editor/CkEditor/CkEditor.php
@ -7,10 +7,10 @@ declare(strict_types=1);
 namespace Chamilo\CoreBundle\Component\Editor\CkEditor;

 use Chamilo\CoreBundle\Component\Editor\Editor;
-use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\SystemTemplate;
 use Chamilo\CoreBundle\Entity\Templates;
+use Chamilo\CoreBundle\Framework\Container;
 use Database;

 class CkEditor extends Editor
@ -42,7 +42,7 @@ class CkEditor extends Editor

        if ('' === $value || '<html><head><title></title></head><body></body></html>' === $value) {
            $style = api_get_bootstrap_and_font_awesome();
-            $style .= api_get_css(ChamiloApi::getEditorDocStylePath());
+            $style .= Container::getThemeHelper()->getThemeAssetLinkTag('document.css');
        }

        $html = '<textarea id="'.$this->getTextareaId().'" name="'.$this->getName().'" >
--- a/src/CoreBundle/Component/Utils/ChamiloApi.php
+++ b/src/CoreBundle/Component/Utils/ChamiloApi.php
@ -295,22 +295,6 @@ class ChamiloApi
        return $prefix.$text;
    }

-    /**
-     * Get the stylesheet path for HTML documents created with CKEditor.
-     */
-    public static function getEditorDocStylePath(): string
-    {
-        $visualTheme = api_get_visual_theme();
-
-        $cssFile = api_get_path(SYS_CSS_PATH).sprintf('themes/%s/document.css', $visualTheme);
-
-        if (is_file($cssFile)) {
-            return api_get_path(WEB_CSS_PATH).sprintf('themes/%s/document.css', $visualTheme);
-        }
-
-        return api_get_path(WEB_CSS_PATH).'document.css';
-    }
-
    /**
     * Get the stylesheet path for HTML blocks created with CKEditor.
     */
--- a/src/CoreBundle/Framework/Container.php
+++ b/src/CoreBundle/Framework/Container.php
@ -41,6 +41,7 @@ use Chamilo\CoreBundle\Repository\TrackEExerciseRepository;
 use Chamilo\CoreBundle\Repository\TrackELoginRecordRepository;
 use Chamilo\CoreBundle\Serializer\UserToJsonNormalizer;
 use Chamilo\CoreBundle\ServiceHelper\ContainerHelper;
+use Chamilo\CoreBundle\ServiceHelper\ThemeHelper;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CoreBundle\Tool\ToolChain;
 use Chamilo\CourseBundle\Repository\CAnnouncementAttachmentRepository;
@ -644,4 +645,9 @@ class Container
    {
        return self::$container->get(TrackELoginRecordRepository::class);
    }
+
+    public static function getThemeHelper(): ThemeHelper
+    {
+        return self::$container->get(ThemeHelper::class);
+    }
 }