X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ftemplate%2Fmail%2Fclass_MailTemplateEngine.php;h=763d46028ae431b022f3b4d88856c393e3040373;hb=6cf40d9bfbe6159ce08cbec4c87d504f5829429d;hp=78b6dcc6e1fedebb8a41bbc1fb2e0534e44d1f4e;hpb=8a14c547a7c7ef07bc3d67778aa4008fa17d703f;p=core.git

diff --git a/framework/main/classes/template/mail/class_MailTemplateEngine.php b/framework/main/classes/template/mail/class_MailTemplateEngine.php
index 78b6dcc6..763d4602 100644
--- a/framework/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/framework/main/classes/template/mail/class_MailTemplateEngine.php
@@ -3,12 +3,16 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
+use CoreFramework\Filesystem\InvalidDirectoryException;
 use CoreFramework\Mailer\DeliverableMail;
 use CoreFramework\Parser\Xml\XmlParser;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Template\CompileableTemplate;
 
+// Import SPL stuff
+use \UnexpectedValueException;
+
 /**
  * The own template engine for loading caching and sending out images
  *
@@ -74,9 +78,8 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 * Creates an instance of the class TemplateEngine and prepares it for usage
 	 *
 	 * @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
+	 * @throws	UnexpectedValueException		If the provided $templateBasePath is empty or no string
+	 * @throws	InvalidDirectoryException	If $templateBasePath is no
 	 *											directory or not found
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
@@ -89,18 +92,18 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		$applicationInstance = Registry::getRegistry()->getInstance('app');
 
 		// Determine base path
-		$templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/';
+		$templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';
 
 		// Is the base path valid?
 		if (empty($templateBasePath)) {
 			// Base path is empty
-			throw new BasePathIsEmptyException($templateInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
+			throw new UnexpectedValueException(sprintf('[%s:%d] Variable templateBasePath is empty.', $templateInstance->__toString(), __LINE__), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
 		} elseif (!is_string($templateBasePath)) {
 			// Is not a string
-			throw new InvalidBasePathStringException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_STRING);
+			throw new UnexpectedValueException(sprintf('[%s:%d] %s is not a string with a base path.', $templateInstance->__toString(), __LINE__, $templateBasePath), self::EXCEPTION_INVALID_STRING);
 		} elseif (!is_dir($templateBasePath)) {
 			// Is not a path
-			throw new BasePathIsNoDirectoryException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
+			throw new InvalidDirectoryException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
 		} elseif (!is_readable($templateBasePath)) {
 			// Is not readable
 			throw new BasePathReadProtectedException(array($templateInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
@@ -114,7 +117,10 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		$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(sprintf('%s%s/',
+			$templateBasePath,
+			$templateInstance->getConfigInstance()->getConfigEntry('compile_output_path')
+		));
 
 		// Return the prepared instance
 		return $templateInstance;