[Vtigercrm-commits] [vtiger-commits] r7958 - in /branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users: detailviewemailtemplate.php editemailtemplate.php saveemailtemplate.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: mmbrich
Date: Tue Jul 11 18:17:05 2006
New Revision: 7958

Log:
more quick changes to email template system for html/plain text emails

Modified:
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php
    branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php

Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/detailviewemailtemplate.php Tue Jul 11 18:17:05 2006
@@ -49,7 +49,7 @@
 $smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]);
 
 $smarty->assign("SUBJECT", $emailtemplateResult["subject"]);
-$smarty->assign("BODY", nl2br($emailtemplateResult["text_body"]));
+$smarty->assign("BODY", nl2br(stripslashes($emailtemplateResult["text_body"])));
 
 $smarty->display("DetailViewEmailTemplate.tpl");
 

Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/editemailtemplate.php Tue Jul 11 18:17:05 2006
@@ -49,8 +49,8 @@
 $smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]);
 $smarty->assign("DESCRIPTION", $emailtemplateResult["description"]);
 $smarty->assign("SUBJECT", $emailtemplateResult["subject"]);
-$smarty->assign("BODY", $emailtemplateResult["body"]);
-$smarty->assign("TEXT_BODY", $emailtemplateResult["text_body"]);
+$smarty->assign("BODY", stripslashes($emailtemplateResult["body"]));
+$smarty->assign("TEXT_BODY", stripslashes($emailtemplateResult["text_body"]));
 $smarty->assign("MODULE", 'Settings');
 $smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 $smarty->assign("EMODE", $mode);

Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/saveemailtemplate.php Tue Jul 11 18:17:05 2006
@@ -28,7 +28,8 @@
 $text_body = $_REQUEST["text_body"];
 if ($body !='')
 {
-	$body = to_html($body);
+	  $body = addslashes($body);
+	  $text_body = addslashes($text_body);
 	  $log->info("the body value is set ");  
 }
 if(isset($templateid) && $templateid !='')