[Vtigercrm-commits] [vtiger-commits] r10788 - in /vtigercrm/branches/5.0.3/modules/Webmails: ListView.php ListViewAjax.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Apr 25 23:28:11 2007
New Revision: 10788

Log:
* Fixed the issue in webmail to, from, cc details

Modified:
    vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
    vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php

Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Wed Apr 25 23:28:11 2007
@@ -277,15 +277,22 @@
 		$val->from = utf8_decode(imap_utf8(addslashes($val->from)));
 		$val->to = utf8_decode(imap_utf8(addslashes($val->to)));
 		$val->subject = utf8_decode(imap_utf8($val->subject));
+		$to = str_replace("<",":",$val->to);
+                $to_list = str_replace(">","",$to);
+                $from = str_replace("<",":",$val->from);
+                $from_list = str_replace(">","",$from);
+                $cc = str_replace("<",":",$hdr->ccaddress);
+                $cc_list = str_replace(">","",$cc);
+
 	?>
 
 		webmail[<?php echo $val->msgno;?>] = new Array();
-		webmail[<?php echo $val->msgno;?>]["from"]="<?php echo addslashes($val->from);?>";
-		webmail[<?php echo $val->msgno;?>]["to"]="<?php echo addslashes($val->to);?>";
+		webmail[<?php echo $val->msgno;?>]["from"]="<?php echo addslashes($from_list);?>";
+		webmail[<?php echo $val->msgno;?>]["to"]="<?php echo addslashes($to_list);?>";
 		webmail[<?php echo $val->msgno;?>]["subject"]="<?php echo addslashes($val->subject);?>";
 		webmail[<?php echo $val->msgno;?>]["date"]="<?php echo addslashes($val->date);?>";
 
-		webmail[<?php echo $val->msgno;?>]["cc"]="<?php echo $hdr->ccaddress;?>";
+		webmail[<?php echo $val->msgno;?>]["cc"]="<?php echo $cc_list;?>";
 
 	<?php
 	}

Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/ListViewAjax.php Wed Apr 25 23:28:11 2007
@@ -104,13 +104,18 @@
                 $val->from = utf8_decode(imap_utf8(addslashes($val->from)));
                 $val->to = utf8_decode(imap_utf8(addslashes($val->to)));
                 $val->subject = utf8_decode(imap_utf8($val->subject));
-		$list = explode("<",$val->from);
+		$to = str_replace("<",":",$val->to);
+		$to_list = str_replace(">","",$to);
+		$from = str_replace("<",":",$val->from);
+		$from_list = str_replace(">","",$from);
+		$cc = str_replace("<",":",$hdr->ccaddress);
+		$cc_list = str_replace(">","",$cc);
 		$js_array .= "webmail2[".$val->msgno."] = new Array();";
-		$js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($list[0])."';";
-		$js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($val->to)."';";
+		$js_array .= "webmail2[".$val->msgno."]['from'] = '".addslashes($from_list)."';";
+		$js_array .= "webmail2[".$val->msgno."]['to'] = '".addslashes($to_list)."';";
 		$js_array .= "webmail2[".$val->msgno."]['subject'] = '".addslashes($val->subject)."';";
 		$js_array .= "webmail2[".$val->msgno."]['date'] = '".addslashes($val->date)."';";
-		$js_array .= "webmail2[".$val->msgno."]['cc'] = '".$hdr->ccaddress."';";
+		$js_array .= "webmail2[".$val->msgno."]['cc'] = '".$cc_list."';";
 	}
 }
 $search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM");