MIME->Mime updates

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client.php b/framework/Imap_Client/lib/Horde/Imap/Client.php
index ab2f73c..fab1c8e 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client.php
@@ -161,16 +161,16 @@ class Horde_Imap_Client
 
         $old_error = error_reporting(0);
         switch ($classname) {
-        case 'Horde_MIME':
-            $res = require_once 'Horde/MIME.php';
+        case 'Horde_Mime':
+            $res = require_once 'Horde/Mime.php';
             break;
 
-        case 'Horde_MIME_Headers':
-            $res = require_once 'Horde/MIME/Headers.php';
+        case 'Horde_Mime_Headers':
+            $res = require_once 'Horde/Mime/Headers.php';
             break;
 
-        case 'Horde_MIME_Message':
-            $res = require_once 'Horde/MIME/Message.php';
+        case 'Horde_Mime_Message':
+            $res = require_once 'Horde/Mime/Message.php';
             break;
 
         case 'Secret':
@@ -322,7 +322,7 @@ class Horde_Imap_Client
     static final public function getBaseSubject($str, $options = array())
     {
         // Rule 1a: MIME decode to UTF-8 (if possible).
-        $str = Horde_MIME::decode($str, 'UTF-8');
+        $str = Horde_Mime::decode($str, 'UTF-8');
 
         // Rule 1b: Remove superfluous whitespace.
         $str = preg_replace("/\s{2,}/", '', $str);

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Cclient.php b/framework/Imap_Client/lib/Horde/Imap/Client/Cclient.php
index e01a5d0..011eead 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Cclient.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Cclient.php
@@ -974,7 +974,7 @@ class Horde_Imap_Client_Cclient extends Horde_Imap_Client_Base
                         break 2;
                     }
                     $structure = $this->_parseStructure($structure);
-                    $ret[$id]['structure'] = empty($c_val['parse']) ? $structure : Horde_MIME_Message::parseStructure($structure);
+                    $ret[$id]['structure'] = empty($c_val['parse']) ? $structure : Horde_Mime_Message::parseStructure($structure);
                 }
                 break;
 
@@ -1023,7 +1023,7 @@ class Horde_Imap_Client_Cclient extends Horde_Imap_Client_Base
                         }
 
                         if (!empty($val['parse'])) {
-                            $tmp = Horde_MIME_Headers::parseHeaders($tmp);
+                            $tmp = Horde_Mime_Headers::parseHeaders($tmp);
                         }
 
                         $ret[$id][$label][$val['id']] = $tmp;

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
index 91ce932..87aeff6 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -2229,7 +2229,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
                 // Only care about these if doing a FETCH command.
                 $tmp['structure'] = empty($this->_temp['fetchparams']['parsestructure'])
                     ? $this->_parseBodystructure($data[++$i])
-                    : Horde_MIME_Message::parseStructure($this->_parseBodystructure($data[++$i]));
+                    : Horde_Mime_Message::parseStructure($this->_parseBodystructure($data[++$i]));
                 break;
 
             case 'ENVELOPE':
@@ -2284,7 +2284,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
 
                         $tmp['headers'][$this->_temp['fetchparams']['hdrfields'][$sig]] = empty($this->_temp['fetchparams']['parseheaders'])
                             ? $data[++$i]
-                            : Horde_MIME_Headers::parseHeaders($data[++$i]);
+                            : Horde_Mime_Headers::parseHeaders($data[++$i]);
                     } else {
                         // Remove trailing bracket and octet start info
                         $tag = substr($tag, 0, strrpos($tag, ']'));
@@ -2314,7 +2314,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
                             }
                             $tmp[$label][$mime_id] = empty($this->_temp['fetchparams']['parseheadertext'])
                                 ? $data[++$i]
-                                : Horde_MIME_Headers::parseHeaders($data[++$i]);
+                                : Horde_Mime_Headers::parseHeaders($data[++$i]);
                         }
                     }
                 } elseif (strpos($tag, 'BINARY[') === 0) {