holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove not used attachmentsPresent value

Browse Source
This commit is contained in:
Ralf Becker 2014-10-07 07:13:37 +00:00
parent 8d3025ffc6
commit 418578dc2f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_ui.inc.php
View File

@ -1789,7 +1789,6 @@ class mail_ui
$data["subject"] = $subject; // the mailsubject $data["subject"] = $subject; // the mailsubject
} }
$imageTag = '';
$imageHTMLBlock = ''; $imageHTMLBlock = '';
//error_log(__METHOD__.__LINE__.array2string($header)); //error_log(__METHOD__.__LINE__.array2string($header));
if (in_array("attachments", $cols)) if (in_array("attachments", $cols))
@ -1806,7 +1805,6 @@ class mail_ui
$header['mimetype'] == 'multipart/alternative') $header['mimetype'] == 'multipart/alternative')
{ {
$image = html::image('mail','attach'); $image = html::image('mail','attach');
$imageTag = '';
$imageHTMLBlock = ''; $imageHTMLBlock = '';
$datarowid = $this->createRowID($_folderName,$message_uid,true); $datarowid = $this->createRowID($_folderName,$message_uid,true);
$attachments = $header['attachments']; $attachments = $header['attachments'];
@ -1817,13 +1815,11 @@ class mail_ui
if (count($attachments)==1) if (count($attachments)==1)
{ {
$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName); $imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName);
$imageTag = json_encode($attachments);
$image = html::image('mail','attach',$attachments[0]['name'].(!empty($attachments[0]['mimeType'])?' ('.$attachments[0]['mimeType'].')':'')); $image = html::image('mail','attach',$attachments[0]['name'].(!empty($attachments[0]['mimeType'])?' ('.$attachments[0]['mimeType'].')':''));
} }
if (count($attachments)>1) if (count($attachments)>1)
{ {
$imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName); $imageHTMLBlock = self::createAttachmentBlock($attachments, $datarowid, $header['uid'],$_folderName);
$imageTag = json_encode($attachments);
$image = html::image('mail','attach',lang('%1 attachments',count($attachments))); $image = html::image('mail','attach',lang('%1 attachments',count($attachments)));
} }
@ -1898,7 +1894,6 @@ class mail_ui
} }
if ($header['disposition-notification-to']) $data['dispositionnotificationto'] = $header['disposition-notification-to']; if ($header['disposition-notification-to']) $data['dispositionnotificationto'] = $header['disposition-notification-to'];
if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']); if (($header['mdnsent']||$header['mdnnotsent']|$header['seen'])&&isset($data['dispositionnotificationto'])) unset($data['dispositionnotificationto']);
$data['attachmentsPresent'] = $imageTag;
$data['attachmentsBlock'] = $imageHTMLBlock; $data['attachmentsBlock'] = $imageHTMLBlock;
$data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]); $data['address'] = ($_folderType?$data["toaddress"]:$data["fromaddress"]);
$rv[] = $data; $rv[] = $data;