Skip to content

Commit 9b4a7cd

Browse files
committed
Optional iconv_mime_decode() support added (#295)
1 parent d62290a commit 9b4a7cd

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/IMAP/Attachment.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,10 @@ public function save($path = null, $filename = null) {
263263
* @param $name
264264
*/
265265
public function setName($name) {
266-
if($this->config['decoder']['message']['subject'] === 'utf-8') {
266+
if($this->config['decoder']['attachment']['name'] === 'utf-8') {
267267
$this->name = \imap_utf8($name);
268+
}elseif($this->config['decoder']['attachment']['name'] === 'iconv') {
269+
$this->name = iconv_mime_decode($name);
268270
}else{
269271
$this->name = mb_decode_mimeheader($name);
270272
}

src/IMAP/Message.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ private function parseHeader() {
399399
if (property_exists($header, 'subject')) {
400400
if($this->config['decoder']['message']['subject'] === 'utf-8') {
401401
$this->subject = \imap_utf8($header->subject);
402+
}elseif($this->config['decoder']['message']['subject'] === 'iconv') {
403+
$this->subject = iconv_mime_decode($header->subject);
402404
}else{
403405
$this->subject = mb_decode_mimeheader($header->subject);
404406
}

src/config/imap.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
| -Decoder options (currently only the message subject and attachment name decoder can be set)
113113
| 'utf-8' - Uses imap_utf8($string) to decode a string
114114
| 'mimeheader' - Uses mb_decode_mimeheader($string) to decode a string
115+
| 'iconv' - Uses iconv_mime_decode($string) to decode a string
115116
|
116117
*/
117118
'options' => [
@@ -127,10 +128,10 @@
127128
],
128129
'decoder' => [
129130
'message' => [
130-
'subject' => 'utf-8' // mimeheader
131+
'subject' => 'utf-8'
131132
],
132133
'attachment' => [
133-
'name' => 'utf-8' // mimeheader
134+
'name' => 'utf-8'
134135
]
135136
]
136137
],

0 commit comments

Comments
 (0)