summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-02-08 08:57:13 +0100
committerAleksander Machniak <alec@alec.pl>2013-02-08 08:57:13 +0100
commitdafb50aa49e13edebdd0c47af861facf4bef12e1 (patch)
tree7aeee1b1dab14bd0ddb0b0d2e67d2bfe0c47490d /plugins
parenta7e8ebc50962d72fe3df9b8cfdd8f2e537fbf04e (diff)
Fix filenames charset handling (#1488946)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/zipdownload/zipdownload.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 96c76eec9..7e132bfbb 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/plugins/zipdownload/zipdownload.php
@@ -30,9 +30,9 @@ class zipdownload extends rcube_plugin
}
$rcmail = rcmail::get_instance();
- $this->charset = $rcmail->config->get('zipdownload_charset', RCUBE_CHARSET);
$this->load_config();
+ $this->charset = $rcmail->config->get('zipdownload_charset', RCUBE_CHARSET);
$this->add_texts('localization');
if ($rcmail->config->get('zipdownload_attachments', 1) > -1 && ($rcmail->action == 'show' || $rcmail->action == 'preview'))
@@ -211,7 +211,7 @@ class zipdownload extends rcube_plugin
$disp_name = "message_rfc822.eml";
$disp_name = $uid . "_" . $disp_name;
-
+
$tmpfn = tempnam($temp_dir, 'zipmessage');
$tmpfp = fopen($tmpfn, 'w');
$imap->get_raw_body($uid, $tmpfp);
@@ -265,8 +265,8 @@ class zipdownload extends rcube_plugin
*/
private function _convert_filename($str, $from = RCUBE_CHARSET)
{
- return strtr(rcube_charset::convert($str, $from, $this->charset), array(':'=>'', '/'=>'-'));
+ $str = rcube_charset::convert($str, $from == '' ? RCUBE_CHARSET : $from, $this->charset);
+
+ return strtr($str, array(':'=>'', '/'=>'-'));
}
}
-
-?> \ No newline at end of file