osTicket Community Forums

diff -ru a/api/pipe.php b/api/pipe.php
--- a/api/pipe.php      2010-02-10 03:43:54.000000000 +0300
+++ b/api/pipe.php      2010-09-25 02:14:26.235597524 +0400
@@ -1,4 +1,3 @@
-#!/usr/bin/php -q
 <?php
 /*********************************************************************
     pipe.php
@@ -77,16 +76,16 @@
 $name=trim($from->personal,'"');
 if($from->comment && $from->comment[0])
     $name.=' ('.$from->comment[0].')';
-$subj=utf8_encode($parser->getSubject());
+$subj=$parser->getSubject();
 if(!($body=Format::stripEmptyLines($parser->getBody())) && $subj)
     $body=$subj;
 
 $var['mid']=$parser->getMessageId();
 $var['email']=$from->mailbox.'@'.$from->host;
-$var['name']=$name?utf8_encode($name):$var['email'];
+$var['name']=$name?$name:$var['email'];
 $var['emailId']=$emailId?$emailId:$cfg->getDefaultEmailId();
 $var['subject']=$subj?$subj:'[No Subject]';
-$var['message']=utf8_encode(Format::stripEmptyLines($body));
+$var['message']=Format::stripEmptyLines($body);
 $var['header']=$parser->getHeader();
 $var['pri']=$cfg->useEmailPriority()?$parser->getPriority():0;
 
diff -ru a/include/pear/Mail/mimeDecode.php b/include/pear/Mail/mimeDecode.php
--- a/include/pear/Mail/mimeDecode.php  2010-02-10 09:23:04.000000000 +0300
+++ b/include/pear/Mail/mimeDecode.php  2010-09-25 02:05:51.248094321 +0400
@@ -298,12 +300,12 @@
             switch (strtolower($content_type['value'])) {
                 case 'text/plain':
                     $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
+                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding, $return->ctype_parameters) : $body) : null;
                     break;
 
                 case 'text/html':
                     $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
+                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding, $return->ctype_parameters) : $body) : null;
                     break;
 
                 case 'multipart/parallel':
@@ -342,7 +344,7 @@
                 default:
                     if(!isset($content_transfer_encoding['value']))
                         $content_transfer_encoding['value'] = '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $content_transfer_encoding['value']) : $body) : null;
+                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $content_transfer_encoding['value'], $return->ctype_parameters) : $body) : null;
                     break;
             }
 
@@ -543,34 +545,41 @@
      */
     function _decodeHeader($input)
     {
-        // Remove white space between encoded-words
-        $input = preg_replace('/(=\?[^?]+\?(q|b)\?[^?]*\?=)(\s)+=\?/i', '\1=?', $input);
 
-        // For each encoded-word...
-        while (preg_match('/(=\?([^?]+)\?(q|b)\?([^?]*)\?=)/i', $input, $matches)) {
+        if (extension_loaded('iconv')) {
+            return iconv_mime_decode($input,2);
+        } else {
+            // Remove white space between encoded-words
+            $input = preg_replace('/(=\?[^?]+\?(q|b)\?[^?]*\?=)(\s)+=\?/i', '\1=?', $input);
 
-            $encoded  = $matches[1];
-            $charset  = $matches[2];
-            $encoding = $matches[3];
-            $text     = $matches[4];
-
-            switch (strtolower($encoding)) {
-                case 'b':
-                    $text = base64_decode($text);
-                    break;
+            // For each encoded-word...
+            while (preg_match('/=\?([^?]+)\?(q|b)\?([^?]*)\?=/i', $input, $matches)) {
+
+                $encoded  = $matches[0];
+                $charset  = $matches[1];
+                $encoding = $matches[2];
+                $text     = $matches[3];
 
-                case 'q':
-                    $text = str_replace('_', ' ', $text);
-                    preg_match_all('/=([a-f0-9]{2})/i', $text, $matches);
-                    foreach($matches[1] as $value)
+
+
+                switch (strtolower($encoding)) {
+                    case 'b':
+                        $text = iconv_mime_decode($text,2);
+                        break;
+
+                    case 'q':
+                        $text = str_replace('_', ' ', $text);
+                        preg_match_all('/=([a-f0-9]{2})/i', $text, $matches);
+                        foreach($matches[1] as $value)
                         $text = str_replace('='.$value, chr(hexdec($value)), $text);
-                    break;
+                        break;
+                }
+
+                $input = str_replace($encoded, $text, $input);
             }
 
-            $input = str_replace($encoded, $text, $input);
+            return $input;
         }
-
-        return $input;
     }
 
     /**
@@ -579,26 +588,40 @@
      *
      * @param  string Input body to decode
      * @param  string Encoding type to use.
+     * @param  string Character set
      * @return string Decoded body
      * @access private
      */
-    function _decodeBody($input, $encoding = '7bit')
+    function _decodeBody($input, $encoding = '7bit', $ctype_params = null)
     {
+
+        $bytes = $input;
         switch (strtolower($encoding)) {
-            case '7bit':
-                return $input;
+            case '7bit':                
                 break;
 
             case 'quoted-printable':
-                return $this->_quotedPrintableDecode($input);
+                $bytes = $this->_quotedPrintableDecode($input);
                 break;
 
             case 'base64':
-                return base64_decode($input);
+                $bytes = base64_decode($input);
                 break;
 
             default:
-                return $input;
+                break;
+        }
+
+        
+        if (extension_loaded('iconv') &&
+            is_array($ctype_params) &&
+            array_key_exists('charset', $ctype_params)) {
+            
+            $charset = $ctype_params['charset'];
+                
+            return iconv($charset, iconv_get_encoding('internal_encoding'), $bytes);
+        } else {
+            return $bytes;
         }
     }

йцукенгшщз

ЪУеЫХЮЧлнк