From 59478e06c25303a790a0840ab2ac30662c4ef781 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Tue, 5 Aug 2014 16:46:22 +0200 Subject: c'est la merde.. --- plugins/zipdownload/README | 2 +- plugins/zipdownload/config.inc.php.dist | 8 ++++---- plugins/zipdownload/localization/ar.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/ar_SA.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/be_BE.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/bg_BG.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/el_GR.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/en_US.inc | 2 +- plugins/zipdownload/localization/eo.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/eu_ES.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/fa_AF.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/fi_FI.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/id_ID.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/ko_KR.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/lb_LU.inc | 3 --- plugins/zipdownload/localization/lv_LV.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/ro_RO.inc | 4 ++-- plugins/zipdownload/localization/ru_RU.inc | 2 +- plugins/zipdownload/localization/sl_SI.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/uk_UA.inc | 20 ++++++++++++++++++ plugins/zipdownload/localization/zh_CN.inc | 20 ++++++++++++++++++ plugins/zipdownload/skins/larry/zipdownload.css | 4 ++-- plugins/zipdownload/zipdownload.php | 27 ++++++++++--------------- 23 files changed, 322 insertions(+), 30 deletions(-) create mode 100644 plugins/zipdownload/localization/ar.inc create mode 100644 plugins/zipdownload/localization/ar_SA.inc create mode 100644 plugins/zipdownload/localization/be_BE.inc create mode 100644 plugins/zipdownload/localization/bg_BG.inc create mode 100644 plugins/zipdownload/localization/el_GR.inc create mode 100644 plugins/zipdownload/localization/eo.inc create mode 100644 plugins/zipdownload/localization/eu_ES.inc create mode 100644 plugins/zipdownload/localization/fa_AF.inc create mode 100644 plugins/zipdownload/localization/fi_FI.inc create mode 100644 plugins/zipdownload/localization/id_ID.inc create mode 100644 plugins/zipdownload/localization/ko_KR.inc create mode 100644 plugins/zipdownload/localization/lv_LV.inc create mode 100644 plugins/zipdownload/localization/sl_SI.inc create mode 100644 plugins/zipdownload/localization/uk_UA.inc create mode 100644 plugins/zipdownload/localization/zh_CN.inc (limited to 'plugins/zipdownload') diff --git a/plugins/zipdownload/README b/plugins/zipdownload/README index f253d63ee..4fa3c17b6 100644 --- a/plugins/zipdownload/README +++ b/plugins/zipdownload/README @@ -23,7 +23,7 @@ folder for details on the skin license. Install ======= * Place this plugin folder into plugins directory of Roundcube -* Add zipdownload to $config['plugins'] in your Roundcube config +* Add zipdownload to $rcmail_config['plugins'] in your Roundcube config NB: When downloading the plugin from GitHub you will need to create a directory called zipdownload and place the files in there, ignoring the diff --git a/plugins/zipdownload/config.inc.php.dist b/plugins/zipdownload/config.inc.php.dist index 0b2d14b60..5c7489a15 100644 --- a/plugins/zipdownload/config.inc.php.dist +++ b/plugins/zipdownload/config.inc.php.dist @@ -7,15 +7,15 @@ // Zip attachments // Only show the link when there are more than this many attachments // -1 to prevent downloading of attachments as zip -$config['zipdownload_attachments'] = 1; +$rcmail_config['zipdownload_attachments'] = 1; // Zip entire folders -$config['zipdownload_folder'] = false; +$rcmail_config['zipdownload_folder'] = false; // Zip selection of messages -$config['zipdownload_selection'] = false; +$rcmail_config['zipdownload_selection'] = false; // Charset to use for filenames inside the zip -$config['zipdownload_charset'] = 'ISO-8859-1'; +$rcmail_config['zipdownload_charset'] = 'ISO-8859-1'; ?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/ar.inc b/plugins/zipdownload/localization/ar.inc new file mode 100644 index 000000000..c5857c96c --- /dev/null +++ b/plugins/zipdownload/localization/ar.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'تنزيل كل المرفقات'; +$labels['downloadfolder'] = 'تنزيل المجلد'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/ar_SA.inc b/plugins/zipdownload/localization/ar_SA.inc new file mode 100644 index 000000000..dd5f5f349 --- /dev/null +++ b/plugins/zipdownload/localization/ar_SA.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'تحميل جميع المرفقات'; +$labels['downloadfolder'] = 'تحميل المجلد'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/be_BE.inc b/plugins/zipdownload/localization/be_BE.inc new file mode 100644 index 000000000..7c6fb3876 --- /dev/null +++ b/plugins/zipdownload/localization/be_BE.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Спампаваць усе далучэнні'; +$labels['downloadfolder'] = 'Спампаваць папку'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/bg_BG.inc b/plugins/zipdownload/localization/bg_BG.inc new file mode 100644 index 000000000..69f91f6f2 --- /dev/null +++ b/plugins/zipdownload/localization/bg_BG.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Изтегляне на всички прикачени файлове'; +$labels['downloadfolder'] = 'Изтегляне на папка'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/el_GR.inc b/plugins/zipdownload/localization/el_GR.inc new file mode 100644 index 000000000..2a12b5da0 --- /dev/null +++ b/plugins/zipdownload/localization/el_GR.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Λυψη ολων των συννημενων'; +$labels['downloadfolder'] = 'Λυψη φακελου'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/en_US.inc b/plugins/zipdownload/localization/en_US.inc index aee8a5e15..8823d3b8d 100644 --- a/plugins/zipdownload/localization/en_US.inc +++ b/plugins/zipdownload/localization/en_US.inc @@ -5,7 +5,7 @@ | plugins/zipdownload/localization/.inc | | | | Localization file of the Roundcube Webmail Zipdownload plugin | - | Copyright (C) 2012-2013, The Roundcube Dev Team | + | Copyright (C) 2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | diff --git a/plugins/zipdownload/localization/eo.inc b/plugins/zipdownload/localization/eo.inc new file mode 100644 index 000000000..bc6ef9d69 --- /dev/null +++ b/plugins/zipdownload/localization/eo.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Elŝuti ĉiujn kunsendaĵojn'; +$labels['downloadfolder'] = 'Elŝuti dosierujon'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/eu_ES.inc b/plugins/zipdownload/localization/eu_ES.inc new file mode 100644 index 000000000..0be09c8b2 --- /dev/null +++ b/plugins/zipdownload/localization/eu_ES.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Deskargatu eranskin guztiak'; +$labels['downloadfolder'] = 'Deskargatu karpeta'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/fa_AF.inc b/plugins/zipdownload/localization/fa_AF.inc new file mode 100644 index 000000000..57bb55ea4 --- /dev/null +++ b/plugins/zipdownload/localization/fa_AF.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'بارگزاری همه ضمیمه ها'; +$labels['downloadfolder'] = 'بارگزاری پوشه'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/fi_FI.inc b/plugins/zipdownload/localization/fi_FI.inc new file mode 100644 index 000000000..7e2c3137d --- /dev/null +++ b/plugins/zipdownload/localization/fi_FI.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Lataa kaikki liitteet'; +$labels['downloadfolder'] = 'Lataa kansio'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/id_ID.inc b/plugins/zipdownload/localization/id_ID.inc new file mode 100644 index 000000000..2ff3c87df --- /dev/null +++ b/plugins/zipdownload/localization/id_ID.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Unduh semua lampiran'; +$labels['downloadfolder'] = 'Folder download'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/ko_KR.inc b/plugins/zipdownload/localization/ko_KR.inc new file mode 100644 index 000000000..cae831353 --- /dev/null +++ b/plugins/zipdownload/localization/ko_KR.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = '모든 첨부파일을 다운로드'; +$labels['downloadfolder'] = '다운로드 폴더'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/lb_LU.inc b/plugins/zipdownload/localization/lb_LU.inc index 6721c51cb..434b064dd 100644 --- a/plugins/zipdownload/localization/lb_LU.inc +++ b/plugins/zipdownload/localization/lb_LU.inc @@ -15,9 +15,6 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ */ - -$labels = array(); $labels['downloadall'] = 'All d\'Unhäng eroflueden'; $labels['downloadfolder'] = 'Dossier eroflueden'; - ?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/lv_LV.inc b/plugins/zipdownload/localization/lv_LV.inc new file mode 100644 index 000000000..b23417abc --- /dev/null +++ b/plugins/zipdownload/localization/lv_LV.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Lejupielādēt visus pielikumus'; +$labels['downloadfolder'] = 'Lejupielādēt mapi'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/ro_RO.inc b/plugins/zipdownload/localization/ro_RO.inc index 7cba54d32..ac4a983d6 100644 --- a/plugins/zipdownload/localization/ro_RO.inc +++ b/plugins/zipdownload/localization/ro_RO.inc @@ -17,7 +17,7 @@ */ $labels = array(); -$labels['downloadall'] = 'Descarca toate atasamentele.'; -$labels['downloadfolder'] = 'Dosar de descărcare'; +$labels['downloadall'] = 'Descarcă toate atașamentele'; +$labels['downloadfolder'] = 'Descarcă dosar'; ?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/ru_RU.inc b/plugins/zipdownload/localization/ru_RU.inc index 0b58fa7fa..014b2001e 100644 --- a/plugins/zipdownload/localization/ru_RU.inc +++ b/plugins/zipdownload/localization/ru_RU.inc @@ -18,6 +18,6 @@ $labels = array(); $labels['downloadall'] = 'Загрузить все вложения'; -$labels['downloadfolder'] = 'Загрузить папку'; +$labels['downloadfolder'] = 'Загрузить каталог'; ?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/sl_SI.inc b/plugins/zipdownload/localization/sl_SI.inc new file mode 100644 index 000000000..07caeacbc --- /dev/null +++ b/plugins/zipdownload/localization/sl_SI.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Prenesi vse priponke'; +$labels['downloadfolder'] = 'Prenesi mapo'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/uk_UA.inc b/plugins/zipdownload/localization/uk_UA.inc new file mode 100644 index 000000000..6232e9a2c --- /dev/null +++ b/plugins/zipdownload/localization/uk_UA.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = 'Завантажити всі вкладення'; +$labels['downloadfolder'] = 'Завантажити теку'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/localization/zh_CN.inc b/plugins/zipdownload/localization/zh_CN.inc new file mode 100644 index 000000000..dfa8db34a --- /dev/null +++ b/plugins/zipdownload/localization/zh_CN.inc @@ -0,0 +1,20 @@ +.inc | + | | + | Localization file of the Roundcube Webmail Zipdownload plugin | + | Copyright (C) 2012-2013, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/ +*/ +$labels['downloadall'] = '下载全部附件'; +$labels['downloadfolder'] = '下载文件夹'; +?> \ No newline at end of file diff --git a/plugins/zipdownload/skins/larry/zipdownload.css b/plugins/zipdownload/skins/larry/zipdownload.css index bb92631b1..d719ac677 100644 --- a/plugins/zipdownload/skins/larry/zipdownload.css +++ b/plugins/zipdownload/skins/larry/zipdownload.css @@ -2,6 +2,6 @@ a.zipdownload { display: inline-block; - margin-top: .5em; + margin-top: 1.5em; padding: 3px 5px 4px 5px; -} +} \ No newline at end of file diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php index 59431267d..443fef728 100644 --- a/plugins/zipdownload/zipdownload.php +++ b/plugins/zipdownload/zipdownload.php @@ -62,14 +62,11 @@ class zipdownload extends rcube_plugin // only show the link if there is more than the configured number of attachments if (substr_count($p['content'], ' $rcmail->config->get('zipdownload_attachments', 1)) { - $href = $rcmail->url(array( - '_action' => 'plugin.zipdownload.zip_attachments', - '_mbox' => $rcmail->output->env['mailbox'], - '_uid' => $rcmail->output->env['uid'], - )); - - $link = html::a(array('href' => $href, 'class' => 'button zipdownload'), - rcube::Q($this->gettext('downloadall')) + $link = html::a(array( + 'href' => rcmail_url('plugin.zipdownload.zip_attachments', array('_mbox' => $rcmail->output->env['mailbox'], '_uid' => $rcmail->output->env['uid'])), + 'class' => 'button zipdownload', + ), + Q($this->gettext('downloadall')) ); // append link to attachments list, slightly different in some skins @@ -99,7 +96,7 @@ class zipdownload extends rcube_plugin $temp_dir = $rcmail->config->get('temp_dir'); $tmpfname = tempnam($temp_dir, 'zipdownload'); $tempfiles = array($tmpfname); - $message = new rcube_message(rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET)); + $message = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET)); // open zip file $zip = new ZipArchive(); @@ -143,7 +140,7 @@ class zipdownload extends rcube_plugin public function download_selection() { if (isset($_REQUEST['_uid'])) { - $uids = explode(",", rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC)); + $uids = explode(",", get_input_value('_uid', RCUBE_INPUT_GPC)); if (sizeof($uids) > 0) $this->_download_messages($uids); @@ -160,7 +157,7 @@ class zipdownload extends rcube_plugin // initialize searching result if search_filter is used if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') { - $imap->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET); + $imap->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET); } // fetch message headers for all pages @@ -169,7 +166,7 @@ class zipdownload extends rcube_plugin for ($i = 0; ($i * $imap->get_pagesize()) <= $count; $i++) { $a_headers = $imap->list_messages($mbox_name, ($i + 1)); - foreach ($a_headers as $header) { + foreach ($a_headers as $n => $header) { if (empty($header)) continue; @@ -199,7 +196,7 @@ class zipdownload extends rcube_plugin $zip = new ZipArchive(); $zip->open($tmpfname, ZIPARCHIVE::OVERWRITE); - foreach ($uids as $uid){ + foreach ($uids as $key => $uid){ $headers = $imap->get_message_headers($uid); $subject = rcube_mime::decode_mime_string((string)$headers->subject); $subject = $this->_convert_filename($subject); @@ -237,9 +234,7 @@ class zipdownload extends rcube_plugin private function _deliver_zipfile($tmpfname, $filename) { $browser = new rcube_browser; - $rcmail = rcmail::get_instance(); - - $rcmail->output->nocacheing_headers(); + send_nocacheing_headers(); if ($browser->ie && $browser->ver < 7) $filename = rawurlencode(abbreviate_string($filename, 55)); -- cgit v1.2.3