[Vtigercrm-commits] [vtiger-commits] r11066 - in /vtigercrm/branches/5.0.3/modules/Webmails: MailParse.php Webmails.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Sat May 26 09:51:03 2007
New Revision: 11066

Log:
fixed - New mail count problem while moving mails and inline attachments not shown in download popup -Sri

Modified:
    vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
    vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php

Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Sat May 26 09:51:03 2007
@@ -17,8 +17,6 @@
 
 	$num = $mails[$start_message]->msgno;
 	$msg_ob = new Webmails($MailBox->mbox,$mails[$start_message]->msgno);
-	$attach_tab = Array();
-	$msg_ob->loadMail($attach_tab);
 	// TODO: scan the current db vtiger_tables to find a
 	// matching email address that will make a good
 	// candidate for record_id
@@ -56,7 +54,7 @@
 
 
         // Attachment Icons
-        if(count($msg_ob->attname) > 0)
+        if($msg_ob->has_attachments)
                 $flags.='<a href="javascript:;" onclick="displayAttachments('.$num.');"><img src="themes/images/attachments.gif" border="0" width="8px" height="13" title="Attachment"></a>&nbsp;';
         else
                 $flags.='<img src="themes/images/blank.gif" border="0" width="8px" height="14" alt="">&nbsp;';
@@ -143,7 +141,7 @@
         if($mails[$start_message]->deleted)
                 $listview_entries[$num][] = '<td nowrap align="center" id="deleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'undelete_msg\','.$num.');"><img src="modules/Webmails/images/gnome-fs-trash-empty.png" border="0" width="14" height="14" alt="del"  title="Delete"></a></span></td></tr>';
         else
-                $listview_entries[$num][] = '<td nowrap align="center" id="ndeleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'delete_msg\','.$num.');"><img src="modules/Webmails/images/gnome-fs-trash-empty.png" border="0" width="14" height="14" alt="del"  title="Delete"></a></span></td></tr>';
+                $listview_entries[$num][] = '<td nowrap align="center" id="ndeleted_td_'.$num.'"><span id="del_link_'.$num.'"><a href="javascript:void(0);" onclick="runEmailCommand(\'delete_msg\','.$num.');"><img src="themes/bluelagoon/images/no.gif" border="0" width="14" height="14" alt="del"  title="Delete"></a></span></td></tr>';
 
 
         return $listview_entries[$num];

Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Sat May 26 09:51:03 2007
@@ -781,7 +781,7 @@
 		$link_att = '';
 		$att_links = '';//variable added to display the attachments in full email view
 		$conf->display_part_no = true;
-		if ($struct_msg->subtype != 'ALTERNATIVE' && $struct_msg->subtype != 'RELATED')
+		if ($struct_msg->subtype != 'ALTERNATIVE' || $struct_msg->subtype != 'RELATED')
 		{
 			switch (sizeof($attach_tab))
 			{