Index: branches/5.3.x/core/units/helpers/email_message_helper.php =================================================================== diff -u -N --- branches/5.3.x/core/units/helpers/email_message_helper.php (revision 15483) +++ branches/5.3.x/core/units/helpers/email_message_helper.php (revision 0) @@ -1,91 +0,0 @@ - '', 'Headers' => '', 'HtmlBody' => '', 'PlainTextBody' => ''); - - if ( $message_type == '' ) { - // this is v5+ e-mail event text as xml node - foreach ($ret as $field => $value) { - $node_name = strtoupper($field); - $ret[$field] = (string)$text->$node_name; - } - - return $ret; - } - - $line_id = 1; - $headers = Array(); - $lines = explode("\n", $text); // "\n" is lost in process - - foreach ($lines as $line_id => $line) { - if ( strlen(trim($line)) == 0 || ($line == '.') ) { - break; - } - - $parts = explode(':', $line, 2); - - if ( strtolower($parts[0]) == 'subject' ) { - $ret['Subject'] = trim($parts[1]); - } - else { - $headers[] = $line; - } - } - - $ret['Headers'] = $headers ? implode("\n", $headers) : null; // it's null field - - $lines = array_slice($lines, $line_id + 1); - - // add "\n", that was lost before - $ret[$message_type == 'html' ? 'HtmlBody' : 'PlainTextBody'] = implode("\n", $lines); - - return $ret; - } - - /** - * 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 - */ - public function parseField($object, $field) - { - $this->Application->InitParser(); - - try { - $this->Application->Parser->CompileRaw($object->GetField($field), 'email_template'); - } - catch (Exception $e) { - if ( $this->Application->isDebugMode() ) { - $this->Application->Debugger->appendHTML('Error in Email Template: ' . $e->getMessage() . ' (line: ' . $e->getLine() . ')'); - } - - $object->SetError($field, 'parsing_error'); - } - } -} \ No newline at end of file