openrat-cms

commit 7ea9d79553200030b7c8341f057c94f05de768bc
parent 67bb752e4e643b9fd30cc29d6c26e64df8914f27
Author: Jan Dankert <develop@jandankert.de>
Date:   Sun, 23 Feb 2020 05:17:22 +0100

Refactoring with Namespaces for the cms modules, last part 3.

Diffstat:
dev-helper/create-output-files.sh
 | 
10
+++++-----
modules/cms/base/init.php
 | 
10
+++++-----
modules/cms/ui/action/IndexAction.class.php
 | 
6
+++---
modules/template_engine/TemplateCompiler.php
 | 
4
++--

4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-helper/create-output-files.sh b/dev-helper/create-output-files.sh
@@ -27,7 +27,7 @@ function language
 
 function check
 {
-    for jsfile in `find ../modules/cms-ui/themes -name "*.js" -not -name "*.min.js"`; do
+    for jsfile in `find ../modules/cms/ui/themes -name "*.js" -not -name "*.min.js"`; do
         jsfile="${jsfile%.*}"
         createfile $jsfile.min.js $jsfile.js
     done
@@ -42,7 +42,7 @@ function check
     done
 
 
-    for tplfile in `find ../modules/cms-ui/themes/ -name "*.tpl.src.xml"`; do
+    for tplfile in `find ../modules/cms/ui/themes/ -name "*.tpl.src.xml"`; do
 
         tplfile="${tplfile%.*}"
         tplfile="${tplfile%.*}"
@@ -51,7 +51,7 @@ function check
     done
 
     # CSS-Files
-    for lessfile in `find ../modules/cms-ui/themes -name "*.less"`; do
+    for lessfile in `find ../modules/cms/ui/themes -name "*.less"`; do
         lessfile="${lessfile%.*}"
         createfile $lessfile.css
         createfile $lessfile.min.css;
@@ -64,8 +64,8 @@ function check
         createfile $lessfile.min.css;
     done
 
-    createfile ../modules/cms-ui/themes/default/production/combined.min.css
-    createfile ../modules/cms-ui/themes/default/production/combined.min.js
+    createfile ../modules/cms/ui/themes/default/production/combined.min.css
+    createfile ../modules/cms/ui/themes/default/production/combined.min.js
 
 }
 
diff --git a/modules/cms/base/init.php b/modules/cms/base/init.php
@@ -32,12 +32,12 @@ define('IMG_ICON_EXT'    ,'.png'   );
 require(__DIR__ . '/version.php');
 define('OR_TITLE'        ,'OpenRat CMS');
 
-define( 'CMS_ROOT_DIR', __DIR__ . '/../cms09/');
+define( 'CMS_ROOT_DIR', __DIR__ . '/../../../');
 
-define('OR_MODULES_DIR'       , __DIR__ . '/modules/');
-define('OR_DYNAMICCLASSES_DIR',OR_MODULES_DIR.'cms-macros/macro/' );
+define('OR_MODULES_DIR'       , __DIR__ . '/../../');
+define('OR_DYNAMICCLASSES_DIR',OR_MODULES_DIR.'cms/macros/macro/' );
 define('OR_SERVICECLASSES_DIR',OR_MODULES_DIR.'util/' );
-define('OR_AUTHCLASSES_DIR'   ,OR_MODULES_DIR.'cms-core/auth/' );
+define('OR_AUTHCLASSES_DIR'   ,OR_MODULES_DIR.'cms/auth/' );
 define('OR_TMP_DIR'           ,CMS_ROOT_DIR.'tmp/'            );
 
 define('START_TIME'           ,time()              );
@@ -45,7 +45,7 @@ define('REQUEST_ID'           ,'req0' ); // Nicht mehr notwendig, kann entfallen
 
 // Must be relative to HTML-Path!
 define('OR_HTML_MODULES_DIR'  ,'./modules/'      );
-define('OR_THEMES_DIR'        ,OR_HTML_MODULES_DIR.'cms-ui/themes/');
+define('OR_THEMES_DIR'        ,OR_HTML_MODULES_DIR.'cms/ui/themes/');
 
 
 
diff --git a/modules/cms/ui/action/IndexAction.class.php b/modules/cms/ui/action/IndexAction.class.php
@@ -153,14 +153,14 @@ class IndexAction extends Action
             $methodList[] = array('name'=>$method,'open'=>$openByDefault);
         }
         $this->setTemplateVar('methodList', $methodList);
-        $this->setTemplateVar('favicon_url', Conf()->subset('theme')->get('favicon','modules/cms-ui/themes/default/images/openrat-logo.ico') );
+        $this->setTemplateVar('favicon_url', Conf()->subset('theme')->get('favicon','modules/cms/ui/themes/default/images/openrat-logo.ico') );
 
         // HTML-Datei direkt einbinden.
         $vars = $this->getOutputData();
         $output  = $vars['output']; // will be extracted in the included template file.
         $notices = $vars['notices']; // will be extracted in the included template file.
 
-		require('modules/cms-ui/themes/default/layout/index.php');
+		require( __DIR__.'/../themes/default/layout/index.php');
 		exit;
 	}
 
@@ -180,7 +180,7 @@ class IndexAction extends Action
 
         $css = array();
 
-        $styleFiles = \util\FileUtils::readDir(OR_THEMES_DIR . 'default/style');
+        $styleFiles = \util\FileUtils::readDir( __DIR__.'/../themes/default/style');
         foreach( $styleFiles as $styleFile ) {
             if  (substr($styleFile,-5) == '.less' )
                 $css[] = OR_THEMES_DIR . 'default/style'.'/'.substr($styleFile,0,-5);
diff --git a/modules/template_engine/TemplateCompiler.php b/modules/template_engine/TemplateCompiler.php
@@ -15,11 +15,11 @@ use template_engine\engine\TemplateEngine;
 use util\FileUtils;
 
 
-$dir = __DIR__ . '/../../modules/cms-ui/themes/default/html/views';
+$dir = __DIR__ . '/../../modules/cms/ui/themes/default/html/views';
 
 require('../../modules/util/require.php');
 require('../../modules/template_engine/require.php');
-require('../../modules/cms-core/require.php');
+require('../../modules/cms/base/require.php');
 
 echo "Searching in $dir\n";