extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-12 19:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem(s) with display of attachments on forward when either forwarding inline with several attachments to the forwarded message or forwarding multiple messages as attachment

Browse Source
This commit is contained in:
Klaus Leithoff 2015-02-12 15:26:55 +00:00
parent 0fd7e7b689
commit 1909ef531d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1967,7 +1967,7 @@ class mail_ui
$preventRedirect=false; $preventRedirect=false;
if(isset($_requesteddata['id'])) $rowID = $_requesteddata['id']; if(isset($_requesteddata['id'])) $rowID = $_requesteddata['id'];
if(isset($_requesteddata['part'])) $partID = $_requesteddata['part']; if(isset($_requesteddata['part'])) $partID = $_requesteddata['part']!='null'?$_requesteddata['part']:null;
if(isset($_requesteddata['mode'])) $preventRedirect = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false); if(isset($_requesteddata['mode'])) $preventRedirect = (($_requesteddata['mode']=='display' || $_requesteddata['mode'] == 'print')?true:false);
$hA = self::splitRowID($rowID); $hA = self::splitRowID($rowID);

3
mail/js/app.js
View File

@ -2239,7 +2239,8 @@ app.classes.mail = AppJS.extend(
attgrid = this.et2.getArrayMgr("content").getEntry('attachments')[widget.id.replace(/\[name\]/,'')]; attgrid = this.et2.getArrayMgr("content").getEntry('attachments')[widget.id.replace(/\[name\]/,'')];
var mailids = this.et2.getArrayMgr("content").getEntry('processedmail_id'); var mailids = this.et2.getArrayMgr("content").getEntry('processedmail_id');
var mailida = mailids.split(','); var mailida = mailids.split(',');
mailid = mailida[widget.id.replace(/\[name\]/,'')]; // either several attachments of one email, or multiple emlfiles
mailid = mailida.length==1 ? mailida[0] : mailida[widget.id.replace(/\[name\]/,'')];
if (typeof attgrid.uid != 'undefined' && attgrid.uid && mailid.indexOf(attgrid.uid)==-1) if (typeof attgrid.uid != 'undefined' && attgrid.uid && mailid.indexOf(attgrid.uid)==-1)
{ {
for (var i=0; i<mailida.length; i++) for (var i=0; i<mailida.length; i++)