X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fweb%2Fclass_WebTemplateEngine.php;h=6033ef59d69cd2448f39d7ba03d719ea66312d64;hp=bc7eb79c35d4e3fbc8b1195e2bd53aeb6b399e52;hb=4b88c118b615335d06bd74e444173d21aef4406c;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/classes/main/template/web/class_WebTemplateEngine.php b/inc/classes/main/template/web/class_WebTemplateEngine.php
index bc7eb79c..6033ef59 100644
--- a/inc/classes/main/template/web/class_WebTemplateEngine.php
+++ b/inc/classes/main/template/web/class_WebTemplateEngine.php
@@ -5,7 +5,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -37,7 +37,7 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat
 	 * Creates an instance of the class TemplateEngine and prepares it for usage
 	 *
 	 * @param	$appInstance	A manageable application
-	 * @return	$tplInstance	An instance of TemplateEngine
+	 * @return	$templateInstance	An instance of TemplateEngine
 	 * @throws	BasePathIsEmptyException		If the provided $templateBasePath is empty
 	 * @throws	InvalidBasePathStringException	If $templateBasePath is no string
 	 * @throws	BasePathIsNoDirectoryException	If $templateBasePath is no
@@ -45,51 +45,48 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createWebTemplateEngine (ManageableApplication $appInstance) {
+	public static final function createWebTemplateEngine (ManageableApplication $appInstance) {
 		// Get a new instance
-		$tplInstance = new WebTemplateEngine();
+		$templateInstance = new WebTemplateEngine();
 
 		// Get language and file I/O instances from application
 		$langInstance = $appInstance->getLanguageInstance();
 		$ioInstance = $appInstance->getFileIoInstance();
 
 		// Determine base path
-		$templateBasePath = $tplInstance->getConfigInstance()->readConfig('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/';
+		$templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/';
 
 		// Is the base path valid?
 		if (empty($templateBasePath)) {
 			// Base path is empty
-			throw new BasePathIsEmptyException($tplInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+			throw new BasePathIsEmptyException($templateInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
 		} elseif (!is_string($templateBasePath)) {
 			// Is not a string
-			throw new InvalidBasePathStringException(array($tplInstance, $templateBasePath), self::EXCEPTION_INVALID_STRING);
+			throw new InvalidBasePathStringException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_STRING);
 		} elseif (!is_dir($templateBasePath)) {
 			// Is not a path
-			throw new BasePathIsNoDirectoryException(array($tplInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
+			throw new BasePathIsNoDirectoryException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
 		} elseif (!is_readable($templateBasePath)) {
 			// Is not readable
-			throw new BasePathReadProtectedException(array($tplInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
+			throw new BasePathReadProtectedException(array($templateInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
 		}
 
-		// Get configuration instance
-		$configInstance = FrameworkConfiguration::getInstance();
-
 		// Set the base path
-		$tplInstance->setTemplateBasePath($templateBasePath);
+		$templateInstance->setTemplateBasePath($templateBasePath);
 
 		// Set the language and IO instances
-		$tplInstance->setLanguageInstance($langInstance);
-		$tplInstance->setFileIoInstance($ioInstance);
+		$templateInstance->setLanguageInstance($langInstance);
+		$templateInstance->setFileIoInstance($ioInstance);
 
 		// Set template extensions
-		$tplInstance->setRawTemplateExtension($configInstance->readConfig('raw_template_extension'));
-		$tplInstance->setCodeTemplateExtension($configInstance->readConfig('code_template_extension'));
+		$templateInstance->setRawTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('raw_template_extension'));
+		$templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('code_template_extension'));
 
 		// Absolute output path for compiled templates
-		$tplInstance->setCompileOutputPath($configInstance->readConfig('base_path') . $configInstance->readConfig('compile_output_path'));
+		$templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
 
 		// Return the prepared instance
-		return $tplInstance;
+		return $templateInstance;
 	}
 }