Changeset 5825 in subversion for branches/devel-framework/roundcubemail

Timestamp:

Jan 26, 2012 6:05:23 AM (17 months ago)

Author:

alec

Message:

• Add lost functions, some improvements and migration bugfixes

Location:

branches/devel-framework/roundcubemail/program/include

Files:

• main.inc (modified) (1 diff)
• rcube_imap.php (modified) (2 diffs)
• rcube_message.php (modified) (1 diff)
• rcube_mime.php (modified) (1 diff)

branches/devel-framework/roundcubemail/program/include/main.inc

@@ -341 +341 @@
     return rcube_request_header($name);
 }
+
+function rc_mime_content_type($path, $name, $failover = 'application/octet-stream', $is_stream=false)
+{
+    return rcube_mime::file_content_type($path, $name, $failover, $is_stream);
+}
+
+function rc_image_content_type($data)
+{
+    return rcube_mime::image_content_type($data);
+}

branches/devel-framework/roundcubemail/program/include/rcube_imap.php

@@ -183 +183 @@
             if ($pass && $user) {
                 $message = sprintf("Login failed for %s from %s. %s",
-                    $user, rcmail::rcmail_remote_ip(), $this->conn->error);
+                    $user, rcmail::remote_ip(), $this->conn->error);
 
                 raise_error(array('code' => 403, 'type' => 'imap',
@@ -830 +830 @@
      * depth, has_children and unread_children
      *
-     * @param  array             $headers Reference to headers array indexed by message UID
-     * @param  rcube_imap_result $threads Threads data object
+     * @param  array               $headers  Reference to headers array indexed by message UID
+     * @param  rcube_result_thread $threads  Threads data object
      *
      * @return array Message headers array indexed by message UID

branches/devel-framework/roundcubemail/program/include/rcube_message.php

@@ -651 +651 @@
                 $uupart->mime_id  = 'uu.' . $part->mime_id . '.' . $pid;
 
-                $ctype = rc_mime_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
+                $ctype = rcube_mime::content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
                 $uupart->mimetype = $ctype;
                 list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);

branches/devel-framework/roundcubemail/program/include/rcube_mime.php

@@ -552 +552 @@
     }
 
+
+    /**
+     * A method to guess the mime_type of an attachment.
+     *
+     * @param string $path      Path to the file.
+     * @param string $name      File name (with suffix)
+     * @param string $failover  Mime type supplied for failover.
+     * @param string $is_stream Set to True if $path contains file body
+     *
+     * @return string
+     * @author Till Klampaeckel <till@php.net>
+     * @see    http://de2.php.net/manual/en/ref.fileinfo.php
+     * @see    http://de2.php.net/mime_content_type
+     */
+    public static function file_content_type($path, $name, $failover = 'application/octet-stream', $is_stream = false)
+    {
+        $mime_type = null;
+        $mime_magic = rcmail::get_instance()->config->get('mime_magic');
+        $mime_ext = @include RCMAIL_CONFIG_DIR . '/mimetypes.php';
+
+        // use file name suffix with hard-coded mime-type map
+        if (is_array($mime_ext) && $name) {
+            if ($suffix = substr($name, strrpos($name, '.')+1)) {
+                $mime_type = $mime_ext[strtolower($suffix)];
+            }
+        }
+
+        // try fileinfo extension if available
+        if (!$mime_type && function_exists('finfo_open')) {
+            if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
+                if ($is_stream)
+                    $mime_type = finfo_buffer($finfo, $path);
+                else
+                    $mime_type = finfo_file($finfo, $path);
+                finfo_close($finfo);
+            }
+        }
+
+        // try PHP's mime_content_type
+        if (!$mime_type && !$is_stream && function_exists('mime_content_type')) {
+            $mime_type = @mime_content_type($path);
+        }
+
+        // fall back to user-submitted string
+        if (!$mime_type) {
+            $mime_type = $failover;
+        }
+        else {
+            // Sometimes (PHP-5.3?) content-type contains charset definition,
+            // Remove it (#1487122) also "charset=binary" is useless
+            $mime_type = array_shift(preg_split('/[; ]/', $mime_type));
+        }
+
+        return $mime_type;
+    }
+
+
+    /**
+     * Detect image type of the given binary data by checking magic numbers.
+     *
+     * @param string $data  Binary file content
+     *
+     * @return string Detected mime-type or jpeg as fallback
+     */
+    public static function image_content_type($data)
+    {
+        $type = 'jpeg';
+        if      (preg_match('/^\x89\x50\x4E\x47/', $data)) $type = 'png';
+        else if (preg_match('/^\x47\x49\x46\x38/', $data)) $type = 'gif';
+        else if (preg_match('/^\x00\x00\x01\x00/', $data)) $type = 'ico';
+    //  else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data)) $type = 'jpeg';
+
+        return 'image/' . $type;
+    }
+
 }