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=64811c5e5104eb7e05cdb5ad5a5875b1dc349d98;hb=e460e503df60eec92ab83b3167eed2e5399097f5;hpb=af9c1b531969b329657895e54d6bea9b89344b8c

diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php
index 64811c5e..c7c6d11b 100644
--- a/inc/classes/main/template/mail/class_MailTemplateEngine.php
+++ b/inc/classes/main/template/mail/class_MailTemplateEngine.php
@@ -60,41 +60,46 @@ 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
 		$configInstance = FrameworkConfiguration::getInstance();
 
 		// Set the base path
-		$tplInstance->setBasePath($basePath);
+		$tplInstance->setTemplateBasePath($templateBasePath);
 
 		// Set the language and IO instances
 		$tplInstance->setLanguageInstance($langInstance);