X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fmail%2Fclass_MailTemplateEngine.php;h=1d39894b2b8b97ef3442ad097019ad9008a45a4a;hp=64811c5e5104eb7e05cdb5ad5a5875b1dc349d98;hb=36e4d0eb331bd724db0bd23071271d5eaeb37b17;hpb=49f84a522f0ccac3b70728cd41011a0be0eed8cf

diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php
index 64811c5e..1d39894b 100644
--- a/inc/classes/main/template/mail/class_MailTemplateEngine.php
+++ b/inc/classes/main/template/mail/class_MailTemplateEngine.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -60,52 +60,57 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	/**
 	 * Creates an instance of the class TemplateEngine and prepares it for usage
 	 *
-	 * @param	$basePath		The local base path for all templates
-	 * @param	$langInstance	An instance of LanguageSystem (default)
-	 * @param	$ioInstance		An instance of FileIoHandler (default, middleware!)
+	 * @param	$appInstance	A manageable application
 	 * @return	$tplInstance	An instance of TemplateEngine
-	 * @throws	BasePathIsEmptyException		If the provided $basePath is empty
-	 * @throws	InvalidBasePathStringException	If $basePath is no string
-	 * @throws	BasePathIsNoDirectoryException	If $basePath is no
+	 * @throws	BasePathIsEmptyException		If the provided $templateBasePath is empty
+	 * @throws	InvalidBasePathStringException	If $templateBasePath is no string
+	 * @throws	BasePathIsNoDirectoryException	If $templateBasePath is no
 	 *											directory or not found
-	 * @throws	BasePathReadProtectedException	If $basePath is
+	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createMailTemplateEngine ($basePath, ManageableLanguage  $langInstance, FileIoHandler $ioInstance) {
+	public final static function createMailTemplateEngine (ManageableApplication $appInstance) {
 		// Get a new instance
 		$tplInstance = new MailTemplateEngine();
 
+		// Get language and file I/O instances from application
+		$langInstance = $appInstance->getLanguageInstance();
+		$ioInstance = $appInstance->getFileIoInstance();
+
+		// Determine base path
+		$templateBasePath = $tplInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/';
+
 		// Is the base path valid?
-		if (empty($basePath)) {
+		if (empty($templateBasePath)) {
 			// Base path is empty
 			throw new BasePathIsEmptyException($tplInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif (!is_string($basePath)) {
+		} elseif (!is_string($templateBasePath)) {
 			// Is not a string
-			throw new InvalidBasePathStringException(array($tplInstance, $basePath), self::EXCEPTION_INVALID_STRING);
-		} elseif (!is_dir($basePath)) {
+			throw new InvalidBasePathStringException(array($tplInstance, $templateBasePath), self::EXCEPTION_INVALID_STRING);
+		} elseif (!is_dir($templateBasePath)) {
 			// Is not a path
-			throw new BasePathIsNoDirectoryException(array($tplInstance, $basePath), self::EXCEPTION_INVALID_PATH_NAME);
-		} elseif (!is_readable($basePath)) {
+			throw new BasePathIsNoDirectoryException(array($tplInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
+		} elseif (!is_readable($templateBasePath)) {
 			// Is not readable
-			throw new BasePathReadProtectedException(array($tplInstance, $basePath), self::EXCEPTION_READ_PROTECED_PATH);
+			throw new BasePathReadProtectedException(array($tplInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
 		}
 
 		// Get configuration instance
 		$configInstance = FrameworkConfiguration::getInstance();
 
 		// Set the base path
-		$tplInstance->setBasePath($basePath);
+		$tplInstance->setTemplateBasePath($templateBasePath);
 
 		// Set the language and IO instances
 		$tplInstance->setLanguageInstance($langInstance);
 		$tplInstance->setFileIoInstance($ioInstance);
 
 		// Set template extensions
-		$tplInstance->setRawTemplateExtension($configInstance->readConfig('raw_template_extension'));
-		$tplInstance->setCodeTemplateExtension($configInstance->readConfig('code_template_extension'));
+		$tplInstance->setRawTemplateExtension($configInstance->getConfigEntry('raw_template_extension'));
+		$tplInstance->setCodeTemplateExtension($configInstance->getConfigEntry('code_template_extension'));
 
 		// Absolute output path for compiled templates
-		$tplInstance->setCompileOutputPath($configInstance->readConfig('base_path') . $configInstance->readConfig('compile_output_path'));
+		$tplInstance->setCompileOutputPath($configInstance->getConfigEntry('base_path') . $configInstance->getConfigEntry('compile_output_path'));
 
 		// Return the prepared instance
 		return $tplInstance;
@@ -164,7 +169,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 			$methodName = 'setEmailProperty' . $this->convertToClassName($element);
 		} elseif ($element != 'text-mail') {
 			// Invalid node name found
-			throw new InvalidXmlNodeException(array($this, $element, $attributes), BaseHelper::EXCEPTION_XML_NODE_UNKNOWN);
+			throw new InvalidXmlNodeException(array($this, $element, $attributes), XmlParser::EXCEPTION_XML_NODE_UNKNOWN);
 		}
 
 		// Call method
@@ -188,7 +193,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		//* DEBUG: */ echo "END: &gt;".$nodeName."&lt;<br />\n";
 		if (($nodeName != $this->getCurrMainNode()) && (in_array($nodeName, $this->getMainNodes()))) {
 			// Did not match!
-			throw new XmlNodeMismatchException (array($this, $nodeName, $this->getCurrMainNode()), BaseHelper::EXCEPTION_XML_NODE_MISMATCH);
+			throw new XmlNodeMismatchException (array($this, $nodeName, $this->getCurrMainNode()), XmlParser::EXCEPTION_XML_NODE_MISMATCH);
 		} elseif (in_array($nodeName, $this->getSubNodes())) {
 			// Silently ignore sub nodes
 			return;