[Vtigercrm-commits] [vtiger-commits] r10843 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php Webmails.php body.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu May 10 15:29:29 2007
New Revision: 10843

Log:
* Fixed the issues in Full mail view

Modified:
    vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php
    vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php
    vtigercrm/branches/5.0.3/modules/Webmails/body.php

Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Thu May 10 15:29:29 2007
@@ -43,7 +43,7 @@
 $array_tab = Array();
 $webmail->loadMail($array_tab);
 
-echo '<tr><td align="center"><iframe src="index.php?module=Webmails&action=body&mailid='.$mailid.'&mailbox='.$mailbox.'" width="100%" height="500" frameborder="0" style="border:1px solid gray">'.$mod_strings['LBL_NO_IFRAMES_SUPPORTED'].'</iframe></td></tr>';
+echo '<tr><td align="center"><iframe src="index.php?module=Webmails&action=body&fullview=true&mailid='.$mailid.'&mailbox='.$mailbox.'" width="100%" height="600" frameborder="0" style="border:1px solid gray">'.$mod_strings['LBL_NO_IFRAMES_SUPPORTED'].'</iframe></td></tr>';
 /*if($webmail->has_attachments)
 {
 	//check for attachments

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 Thu May 10 15:29:29 2007
@@ -853,8 +853,6 @@
 		$timestamp = chop($ref_contenu_message->udate);
 		$date = format_date($timestamp, $lang);
 		$time = format_time($timestamp, $lang);
-		$this->date = $date;
-		$this->time = $time;
 		$content = Array(
 			'from' => $from,
 			'to' => $to,

Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original)
+++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Thu May 10 15:29:29 2007
@@ -38,9 +38,9 @@
 $to = decode_header($email->to_header);
 $cc = decode_header($email->cc_header);
 $date = decode_header($email->date);
-/*for($i=0;$i<count($email->attname);$i++){
+for($i=0;$i<count($email->attname);$i++){
 	$attachment_links .= $email->anchor_arr[$i].decode_header($email->attname[$i])."</a></br>";
-}*/
+}
 $content['body'] = '<span id="webmail_body">'.$email->body.'</span>';
 $content['attachtab'] = $email->attachtab;
 
@@ -55,9 +55,15 @@
 <tr><td width="20%" align="right"><b><?php echo $mod_strings['LBL_CC'];?></b></td><td id="webmail_cc"><?php echo $cc;?></td></tr>
 
                                                 <tr><td align="right"><b><?php echo $mod_strings['LBL_SUBJECT'];?></b></td><td id="webmail_subject"><?php echo $subject;?></td></tr>
-                <tr><td align="right"><b><?php echo $mod_strings['MOD.LBL_DATE'];?></b></td><td id="webmail_date"><?php echo $date;?></td>
-      <tr> 
-	<td>&nbsp;</td> <td id="full_view"><span style="float:right"  colspan="2"><a href="javascript:;" onclick="OpenComposer('<?php echo $mailid;?>','full_view')"> Full Email View</a></span></td></tr>
+	<tr><td align="right"><b><?php echo $mod_strings['LBL_DATE'];?></b></td><td id="webmail_date"><?php echo $date;?></td>
+        <tr>
+	<?php if($_REQUEST['fullview'] && $email->has_attachments) {?>
+		<td align="right"><b><?php echo $mod_strings['LBL_ATTACHMENT'];?>:</b></td><td id="webmail_attachment"><?php echo $attachment_links;?></td>
+	<?php } ?>
+	<?php if(!$_REQUEST['fullview']) {?>
+	<td>&nbsp;</td> <td id="full_view"><span style="float:right"  colspan="2"><a href="javascript:;" onclick="OpenComposer('<?php echo $mailid;?>','full_view')"> Full Email View</a></span></td>
+	<?php } ?>
+	</tr>
                                                 <tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3">&nbsp;</td></tr>
                                         </table>
                                         <!-- Table to display the Header details (From, To, Subject and date) - Ends -->