Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 99 insertions, 0 deletions

diff --git a/plugins/zipdownload/zipdownload.js b/plugins/zipdownload/zipdownload.js
new file mode 100644
index 000000000..af9136c1d
--- /dev/null
+++ b/plugins/zipdownload/zipdownload.js
@@ -0,0 +1,99 @@
+/**
+ * ZipDownload plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (c) 2013-2014, The Roundcube Dev Team
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+window.rcmail && rcmail.addEventListener('init', function(evt) {
+    // register additional actions
+    rcmail.register_command('download-eml', function() { rcmail_zipdownload('eml'); });
+    rcmail.register_command('download-mbox', function() { rcmail_zipdownload('mbox'); });
+    rcmail.register_command('download-maildir', function() { rcmail_zipdownload('maildir'); });
+
+    // commands status
+    rcmail.message_list && rcmail.message_list.addEventListener('select', function(list) {
+        var selected = list.get_selection().length;
+
+        rcmail.enable_command('download', selected > 0);
+        rcmail.enable_command('download-eml', selected == 1);
+        rcmail.enable_command('download-mbox', 'download-maildir', selected > 1);
+    });
+
+    // hook before default download action
+    rcmail.addEventListener('beforedownload', rcmail_zipdownload_menu);
+
+    // find and modify default download link/button
+    $.each(rcmail.buttons['download'] || [], function() {
+        var link = $('#' + this.id),
+            span = $('span', link);
+
+        if (!span.length) {
+            span = $('<span>');
+            link.html('').append(span);
+        }
+
+        span.text(rcmail.gettext('zipdownload.download'));
+        rcmail.env.download_link = link;
+    });
+  });
+
+
+function rcmail_zipdownload(mode)
+{
+    // default .eml download of single message
+    if (mode == 'eml') {
+        var uid = rcmail.get_single_uid();
+        rcmail.goto_url('viewsource', {_uid: uid, _mbox: rcmail.get_message_mailbox(uid), _save: 1});
+        return;
+    }
+
+    // multi-message download, use hidden form to POST selection
+    if (rcmail.message_list && rcmail.message_list.get_selection().length > 1) {
+        var inputs = [], form = $('#zipdownload-form'),
+            post = rcmail.selection_post_data();
+
+        post._mode = mode;
+        post._token = rcmail.env.request_token;
+
+        $.each(post, function(k, v) {
+            if (typeof v == 'object' && v.length > 1) {
+              for (var j=0; j < v.length; j++)
+                  inputs.push($('<input>').attr({type: 'hidden', name: k+'[]', value: v[j]}));
+            }
+            else {
+                inputs.push($('<input>').attr({type: 'hidden', name: k, value: v}));
+            }
+        });
+
+        if (!form.length)
+            form = $('<form>').attr({
+                    style: 'display: none',
+                    method: 'POST',
+                    action: '?_task=mail&_action=plugin.zipdownload.messages'
+                })
+                .appendTo('body');
+
+        form.html('').append(inputs).submit();
+    }
+}
+
+// display download options menu
+function rcmail_zipdownload_menu(e)
+{
+    // show (sub)menu for download selection
+    rcmail.command('menu-open', 'zipdownload-menu', e && e.target ? e.target : rcmail.env.download_link, e);
+
+    // abort default download action
+    return false;
+}