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

different approach on calling bulk-download (all attachments in one archive)

Browse Source
This commit is contained in:
Klaus Leithoff 2014-07-08 12:01:29 +00:00
parent 55722f4520
commit 096f753a59
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ class mail_ui
'displayMessage' => True, 'displayMessage' => True,
'displayImage' => True, 'displayImage' => True,
'getAttachment' => True, 'getAttachment' => True,
'download_zip' => True,
'saveMessage' => True, 'saveMessage' => True,
'vfsSaveAttachment' => True, 'vfsSaveAttachment' => True,
'vfsSaveMessage' => True, 'vfsSaveMessage' => True,
@ -424,6 +425,7 @@ class mail_ui
} }
//error_log(__METHOD__.__LINE__.' SessionFolder:'.$sessionFolder.' isToSchema:'.$toSchema); //error_log(__METHOD__.__LINE__.' SessionFolder:'.$sessionFolder.' isToSchema:'.$toSchema);
//_debug_array($content); //_debug_array($content);
//if (is_array($content)) error_log(__METHOD__.__LINE__.array2string($content));
if (!is_array($content)) if (!is_array($content))
{ {
$content = array( $content = array(
@ -2830,10 +2832,11 @@ class mail_ui
* Zip all attachments and send to user * Zip all attachments and send to user
* @param string $message_id * @param string $message_id
*/ */
function download_zip($message_id) function download_zip($message_id=null)
{ {
//error_log(__METHOD__.__LINE__.$message_id);
// First, get all attachment IDs // First, get all attachment IDs
if(isset($_GET['id'])) $message_id = $_GET['id'];
//error_log(__METHOD__.__LINE__.$message_id);
if(!is_numeric($message_id)) if(!is_numeric($message_id))
{ {
$hA = self::splitRowID($message_id); $hA = self::splitRowID($message_id);

26
mail/js/app.js
View File

@ -2225,6 +2225,32 @@ app.classes.mail = AppJS.extend(
document.location = url; document.location = url;
}, },
saveAllAttachmentsToZip: function(tag_info, widget)
{
var mailid;
var attgrid;
if (this.mail_isMainWindow)
{
mailid = this.mail_currentlyFocussed;//this.et2.getArrayMgr("content").getEntry('mail_id');
var p = widget.getParent();
var cont = p.getArrayMgr("content").data;
attgrid = cont[widget.id.replace(/\[save\]/,'')];
}
else
{
mailid = this.et2.getArrayMgr("content").getEntry('mail_id');
attgrid = this.et2.getArrayMgr("content").getEntry('mail_displayattachments')[widget.id.replace(/\[save\]/,'')];
}
var url = window.egw_webserverUrl+'/index.php?';
var width;
var height;
var windowName ='mail';
url += 'menuaction=mail.mail_ui.download_zip'; // todo compose for Draft folder
url += '&mode=save';
url += '&id='+mailid;
document.location = url;
},
saveAttachmentToVFS: function(tag_info, widget) saveAttachmentToVFS: function(tag_info, widget)
{ {
var mailid; var mailid;

2
mail/templates/default/display.xet
View File

@ -78,7 +78,7 @@
<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/> <buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/> <buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/> <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_all" onclick="widget.getInstanceManager().postSubmit();" label="Save as Zip"/> <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
</row> </row>
</rows> </rows>
</grid> </grid>

2
mail/templates/default/index.xet
View File

@ -102,7 +102,7 @@
<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/> <buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/> <buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/> <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_all" onclick="widget.getInstanceManager().postSubmit();" label="Save as Zip"/> <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
</row> </row>
</rows> </rows>
</grid> </grid>