openrat-cms

commit ee8402fff873ebd16607a8c9429cfd1683d47028
parent 50986176e6e49ccbdc9e7327b6584ba1d5f69acd
Author: Jan Dankert <devnull@localhost>
Date:   Sat,  6 Jan 2018 01:47:51 +0100

Menge der Komponenten aus dem Modul Template-Engine laden, denn dort ist die Information richtig aufgehoben.

Diffstat:
modules/cms-core/action/IndexAction.class.php
 | 
9
+++------
modules/template-engine/TemplateEngineInfo.class.php
 | 
8
++++++++
modules/template-engine/require.php
 | 
1
+

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/modules/cms-core/action/IndexAction.class.php b/modules/cms-core/action/IndexAction.class.php
@@ -10,6 +10,7 @@ use Less_Parser;
 use Logger;
 use ObjectNotFoundException;
 use Session;
+use template_engine\TemplateEngineInfo;
 
 
 /**
@@ -126,9 +127,7 @@ class IndexAction extends Action
         //$css[] = OR_HTML_MODULES_DIR . 'editor/codemirror/lib/codemirror';
 
         // Komponentenbasiertes CSS
-		$elements = parse_ini_file(OR_THEMES_DIR . config('interface', 'theme') . '/include/elements.ini.' . PHP_EXT);
-		
-		foreach (array_keys($elements) as $c)
+		foreach (TemplateEngineInfo::getComponentList() as $c)
 		{
 			$componentCssFile = OR_HTML_MODULES_DIR . 'template-engine/components/html/' . $c . '/' . $c;
 			if (is_file($componentCssFile . '.less'))
@@ -443,9 +442,7 @@ class IndexAction extends Action
 			//$js[] = OR_THEMES_DIR . '../editor/editor/adapters/jquery';
 			
 			// Komponentenbasiertes Javascript
-			$elements = parse_ini_file(OR_THEMES_DIR . config('interface', 'theme') . '/include/elements.ini.' . PHP_EXT);
-			
-			foreach (array_keys($elements) as $c)
+			foreach ( TemplateEngineInfo::getComponentList() as $c)
 			{
 				$componentJsFile = OR_HTML_MODULES_DIR .  '/template-engine/components/html/' . $c . '/' . $c;
 				if (is_file($componentJsFile . '.js'))
diff --git a/modules/template-engine/TemplateEngineInfo.class.php b/modules/template-engine/TemplateEngineInfo.class.php
@@ -5,6 +5,14 @@ namespace template_engine;
 class TemplateEngineInfo
 {
 
+    public static function getComponentList()
+    {
+        $components = parse_ini_file(__DIR__.'/components/components.ini');
+
+        return array_keys($components);
+    }
+
+
 	public static function getLESSFiles()
 	{
 	    return self::getComponentFilesByExtension('.less');
diff --git a/modules/template-engine/require.php b/modules/template-engine/require.php
@@ -1,5 +1,6 @@
 <?php
 
+include( dirname(__FILE__) . '/TemplateEngineInfo.class.php');
 include( dirname(__FILE__) . '/engine/TemplateEngine.class.php');
 
 ?> 
\ No newline at end of file