[Vtigercrm-commits] [vtiger-commits] r10153 - in /vtigercrm/branches/5.0.3: include/utils/utils.php modules/Emails/mail.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed Feb  7 06:12:13 2007
New Revision: 10153

Log:
Format issue in outgoing emails fixed. Fixes #2831 and #2531 

Modified:
    vtigercrm/branches/5.0.3/include/utils/utils.php
    vtigercrm/branches/5.0.3/modules/Emails/mail.php

Modified: vtigercrm/branches/5.0.3/include/utils/utils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/utils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/utils.php Wed Feb  7 06:12:13 2007
@@ -867,7 +867,7 @@
         global $toHtml;
         if($encode && is_string($string)){//$string = htmlentities($string, ENT_QUOTES);
 		if (is_array($toHtml))
-			$string =strip_tags($string, '<span><br /><div><a><br><b><u><i>');
+			$string =strip_tags($string, '<span><br /><div><a><br><b><u><i><table><td><tr><style><p><command>');
         }
 	$log->debug("Exiting to_html method ...");
         return $string;

Modified: vtigercrm/branches/5.0.3/modules/Emails/mail.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/mail.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/mail.php Wed Feb  7 06:12:13 2007
@@ -106,7 +106,7 @@
 	global $adb;
 	$adb->println("Inside the function addSignature");
 
-	$sign = $adb->query_result($adb->query("select signature from vtiger_users where user_name=".$adb->quote($fromname)),0,"signature");
+	$sign = nl2br($adb->query_result($adb->query("select signature from vtiger_users where user_name=".$adb->quote($fromname)),0,"signature"));
 	if($sign != '')
 	{
 		$contents .= '<br><br><font color=darkgrey>'.$sign.'</font>';