Index: branches/5.2.x/core/units/helpers/email_message_helper.php
===================================================================
diff -u -N -r15222 -r15225
--- branches/5.2.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 15222)
+++ branches/5.2.x/core/units/helpers/email_message_helper.php	(.../email_message_helper.php)	(revision 15225)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_message_helper.php 15222 2012-03-15 16:38:49Z alex $
+* @version	$Id: email_message_helper.php 15225 2012-03-20 09:48:10Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,7 +14,7 @@
 
 defined('FULL_PATH') or die('restricted access!');
 
-class EmailMessageHelper extends kHelper {
+class kEmailMessageHelper extends kHelper {
 
 	/**
 	 * Extracts Subject, Headers, Body fields from email message translation
@@ -67,37 +67,25 @@
 	}
 
 	/**
-	 * Prepares email event content for language pack export
-	 *
-	 * @param Array $fields_hash
-	 * @return string
+	 * Parses contents of given object field and sets error, when invalid in-portal tags found
+	 * @param kDBItem $object
+	 * @param string $field
+	 * @return void
+	 * @access public
 	 */
-	function buildTemplate($fields_hash)
+	public function parseField($object, $field)
 	{
-		if (!implode('', $fields_hash)) {
-			return '';
-		}
+		$this->Application->InitParser();
 
-		$ret = array_key_exists('Headers', $fields_hash) ? $fields_hash['Headers'] : '';
-		if ($ret) {
-			$ret .= "\n";
+		try {
+			$this->Application->Parser->CompileRaw($object->GetField($field), 'email_template');
 		}
+		catch (ParserException $e) {
+			if ( $this->Application->isDebugMode() ) {
+				$this->Application->Debugger->appendHTML('<b style="color: red;">Error in Email Template:</b> ' . $e->getMessage() . ' (line: ' . $e->getLine() . ')');
+			}
 
-		$ret = $this->_removeTrailingCRLF($ret);
-		$ret .= 'Subject: ' . $fields_hash['Subject'] . "\n\n";
-		$ret .= $fields_hash['Body'];
-
-		return $ret;
+			$object->SetError($field, 'parsing_error');
+		}
 	}
-
-	/**
-	 * Remove trailing CR/LF chars from string
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	function _removeTrailingCRLF($string)
-	{
-		return preg_replace('/(\n|\r)+/',"\\1",$string);
-	}
 }
\ No newline at end of file