X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FMessageTemplate.php;h=bb11a9cebf80dbe7627c470a88a2944bb2a21ab9;hb=5fb0ca0d95d05c3ade12f75226a748a357848511;hp=0eacbd9f38a3145d51d09e83a1a86d5ecf2a48b7;hpb=a5af58bcf2ca094903fb19fb511392aeaf788c16;p=civicrm-core.git

diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php
index 0eacbd9f38..bb11a9cebf 100644
--- a/CRM/Core/BAO/MessageTemplate.php
+++ b/CRM/Core/BAO/MessageTemplate.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,12 +28,16 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
 
 require_once 'Mail/mime.php';
+
+/**
+ * Class CRM_Core_BAO_MessageTemplate
+ */
 class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
 
   /**
@@ -101,6 +105,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
    * @access public
    * @static
    *
+   * @param $messageTemplatesID
+   *
    * @return object
    */
   static function del($messageTemplatesID) {
@@ -129,6 +135,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
    * @access public
    * @static
    *
+   * @param bool $all
+   *
    * @return object
    */
   static function getMessageTemplates($all = TRUE) {
@@ -148,6 +156,14 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
     return $msgTpls;
   }
 
+  /**
+   * @param $contactId
+   * @param $email
+   * @param $messageTemplateID
+   * @param $from
+   *
+   * @return bool|null
+   */
   static function sendReminder($contactId, $email, $messageTemplateID, $from) {
 
     $messageTemplates = new CRM_Core_DAO_MessageTemplate();
@@ -425,8 +441,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
       $contact = $contact[$contactID];
     }
 
-    $subject = CRM_Utils_Token::replaceDomainTokens($subject, $domain, TRUE, $tokens['text'], TRUE);
-    $text    = CRM_Utils_Token::replaceDomainTokens($text, $domain, TRUE, $tokens['text'], TRUE);
+    $subject = CRM_Utils_Token::replaceDomainTokens($subject, $domain, FALSE, $tokens['text'], TRUE);
+    $text    = CRM_Utils_Token::replaceDomainTokens($text, $domain, FALSE, $tokens['text'], TRUE);
     $html    = CRM_Utils_Token::replaceDomainTokens($html, $domain, TRUE, $tokens['html'], TRUE);
 
     if ($contactID) {
@@ -493,29 +509,10 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
         $params['PDFFilename'] &&
         $params['html']
       ) {
-        $pdf_filename = $config->templateCompileDir . CRM_Utils_File::makeFileName($params['PDFFilename']);
-
-        //FIXME : CRM-7894
-        //xmlns attribute is required in XHTML but it is invalid in HTML,
-        //Also the namespace "xmlns=http://www.w3.org/1999/xhtml" is default,
-        //and will be added to the <html> tag even if you do not include it.
-        $html = preg_replace('/(<html)(.+?xmlns=["\'].[^\s]+["\'])(.+)?(>)/', '\1\3\4', $params['html']);
-
-        file_put_contents($pdf_filename, CRM_Utils_PDF_Utils::html2pdf($html,
-            $params['PDFFilename'],
-            TRUE,
-            $format
-          )
-        );
-
         if (empty($params['attachments'])) {
           $params['attachments'] = array();
         }
-        $params['attachments'][] = array(
-          'fullPath' => $pdf_filename,
-          'mime_type' => 'application/pdf',
-          'cleanName' => $params['PDFFilename'],
-        );
+        $params['attachments'][] = CRM_Utils_Mail::appendPDF($params['PDFFilename'], $params['html'], $format);
       }
 
       $sent = CRM_Utils_Mail::send($params);
@@ -528,4 +525,3 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
     return array($sent, $subject, $text, $html);
   }
 }
-
