Changeset 70318e5 in github

Timestamp:

Apr 1, 2010 9:42:39 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

cd96fd6

Parents:

1820932

Message:

• create rcube_mime_struct class on Iloha's MIME (mime.inc) basis

Location:

program

Files:

• include/rcube_imap.php (modified) (4 diffs)
• include/rcube_mime_struct.php (added)
• lib/mime.inc (deleted)

program/include/rcube_imap.php

@@ -20 +20 @@
 
 */
-
-
-require_once('lib/mime.inc');
-require_once('lib/tnef_decoder.inc');
 
 
@@ -1615 +1611 @@
         }
 
-        if (!$structure_str)
+        if (!$structure_str) {
             $structure_str = $this->conn->fetchStructureString($this->mailbox, $uid, true);
-        $structure = iml_GetRawStructureArray($structure_str);
+        }
+        $structure = rcube_mime_struct::parseStructure($structure_str);
         $struct = false;
 
@@ -1967 +1964 @@
         if (!is_object($o_part)) {
             $structure_str = $this->conn->fetchStructureString($this->mailbox, $uid, true); 
-            $structure = iml_GetRawStructureArray($structure_str);
+            $structure = new rcube_mime_struct();
             // error or message not found
-            if (empty($structure))
+            if (!$structure->loadStructure($structure_str)) {
                 return false;
-
-            $part_type = iml_GetPartTypeCode($structure, $part);
+            }
+
             $o_part = new rcube_message_part;
-            $o_part->ctype_primary = $part_type==0 ? 'text' : ($part_type==2 ? 'message' : 'other');
-            $o_part->encoding = strtolower(iml_GetPartEncodingString($structure, $part));
-            $o_part->charset = iml_GetPartCharset($structure, $part);
+            $o_part->ctype_primary = strtolower($structure->getPartType($part));
+            $o_part->encoding      = strtolower($structure->getPartEncoding($part));
+            $o_part->charset       = $structure->getPartCharset($part);
         }
       
@@ -3332 +3329 @@
             $part->body = $this->get_message_part($uid, $part->mime_id, $part);
 
+        require_once('lib/tnef_decoder.inc');
+
         $pid = 0;
         $tnef_parts = array();