From c2c31457e8ccbe19718fadf11883d61410167be8 Mon Sep 17 00:00:00 2001 From: Benjamin Choquet Date: Tue, 20 Dec 2011 18:08:49 +0100 Subject: [PATCH] allow to set email content-type from templates --- datatypes/ezsurvey/ezsurveytype.php | 6 ++++++ modules/survey/classes/ezsurveyfeedbackfield.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/datatypes/ezsurvey/ezsurveytype.php b/datatypes/ezsurvey/ezsurveytype.php index eb6a227..1a45a2c 100644 --- a/datatypes/ezsurvey/ezsurveytype.php +++ b/datatypes/ezsurvey/ezsurveytype.php @@ -411,6 +411,12 @@ function processViewActions( $objectAttribute, &$survey, &$validation ) $mail->setSubject( $subject ); $mail->setBody( $templateResult ); + if ( $tpl_email->hasVariable( 'content_type' ) ) + { + $mail->setContentType( $tpl_email->variable( 'content_type' ) ); + } + + $mailResult = eZMailTransport::send( $mail ); } diff --git a/modules/survey/classes/ezsurveyfeedbackfield.php b/modules/survey/classes/ezsurveyfeedbackfield.php index c3eb2ef..88afe77 100644 --- a/modules/survey/classes/ezsurveyfeedbackfield.php +++ b/modules/survey/classes/ezsurveyfeedbackfield.php @@ -304,6 +304,12 @@ public function executeBeforeLastRedirect( $node ) $mail->setSubject( $subject ); $mail->setBody( $templateResult ); + + if ( $tpl_email->hasVariable( 'content_type' ) ) + { + $mail->setContentType( $tpl_email->variable( 'content_type' ) ); + } + if ( $this->Num == 1 ) { $adminReceiver = $ini->variable( 'MailSettings', 'AdminEmail' );