Some updates:

[core.git] / framework / main / classes / template / class_

diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_
index 488c3c140029ee513eeb4c0c498ea34f25e72c00..5e16c25145ff8169f7d1985d1e93ad71d488e456 100644 (file)
--- a/framework/main/classes/template/class_
+++ b/framework/main/classes/template/class_
@@ -1,10 +1,20 @@
 <?php
+// Own namespace
+namespace CoreFramework\Template\Engine\;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
+
 /**
  * A ??? template engine class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/template/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/template/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -49,7 +59,7 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
                $templateInstance = new ???TemplateEngine();
 
                // Determine base path
-               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/';
+               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . DIRECTORY_SEPARATOR;
 
                // Is the base path valid?
                if (empty($templateBasePath)) {
@@ -74,12 +84,10 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
                $templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('code_template_extension'));
 
                // Absolute output path for compiled templates
-               $templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
+               $templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
 
                // Return the prepared instance
                return $templateInstance;
        }
-}
 
-// [EOF]
-?>
+}