X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fmail%2Fclass_MailTemplateEngine.php;h=c7c6d11bca52eea6037e5ec6afbf3f449f23bdc8;hp=8fcd0f9e5f685b963bb454fec23dbd736c4d6246;hb=e460e503df60eec92ab83b3167eed2e5399097f5;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308

diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php
index 8fcd0f9e..c7c6d11b 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, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -30,7 +30,12 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	/**
 	 * Sub nodes in the XML tree
 	 */
-	private $subNodes = array("subject-line", "sender-address", "recipient-address", "message");
+	private $subNodes = array(
+		'subject-line',
+		'sender-address',
+		'recipient-address',
+		'message'
+	);
 
 	/**
 	 * Mailer instance
@@ -40,7 +45,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	/**
 	 * Current main node
 	 */
-	private $currMainNode = "";
+	private $currMainNode = '';
 
 	/**
 	 * Protected constructor
@@ -55,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()->readConfig('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
-		$cfgInstance = FrameworkConfiguration::getInstance();
+		$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($cfgInstance->readConfig('raw_template_extension'));
-		$tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
+		$tplInstance->setRawTemplateExtension($configInstance->readConfig('raw_template_extension'));
+		$tplInstance->setCodeTemplateExtension($configInstance->readConfig('code_template_extension'));
 
 		// Absolute output path for compiled templates
-		$tplInstance->setCompileOutputPath($cfgInstance->readConfig('base_path') . $cfgInstance->readConfig('compile_output_path'));
+		$tplInstance->setCompileOutputPath($configInstance->readConfig('base_path') . $configInstance->readConfig('compile_output_path'));
 
 		// Return the prepared instance
 		return $tplInstance;
@@ -316,7 +326,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 */
 	public function getMailCacheFqfn () {
 		// Initialize FQFN
-		$fqfn = "";
+		$fqfn = '';
 		$this->debugBackTrace();
 
 		// Return it