alecpl
2008-06-07 b541216c53f8fd286ccb0e9e6172ffdcce8f2592
program/include/rcube_imap.php
@@ -1162,7 +1162,10 @@
      
    // normalize filename property
    if ($filename_mime = $struct->d_parameters['filename'] ? $struct->d_parameters['filename'] : $struct->ctype_parameters['name'])
      $struct->filename = rcube_imap::decode_mime_string($filename_mime, $this->default_charset);
    {
      $struct->filename = rcube_imap::decode_mime_string($filename_mime,
           $struct->charset ? $struct->charset : rc_detect_encoding($filename_mime, $this->default_charset));
    }
    else if ($filename_encoded = $struct->d_parameters['filename*'] ? $struct->d_parameters['filename*'] : $struct->ctype_parameters['name*'])
    {
      // decode filename according to RFC 2231, Section 4
@@ -1170,7 +1173,8 @@
      $struct->filename = rcube_charset_convert(urldecode($filename_urlencoded), $filename_charset);
    }
    else if (!empty($struct->headers['content-description']))
      $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'], $this->default_charset);
      $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'],
           $struct->charset ? $struct->charset : rc_detect_encoding($struct->headers['content-description'],$this->default_charset));
      
    return $struct;
    }