Changeset 4324 in subversion

Timestamp:

Dec 8, 2010 3:36:08 PM (2 years ago)

Author:

thomasb

Message:

Move image type detection to shared function

Location:

branches/devel-addressbook/program

Files:

• include/rcube_shared.inc (modified) (1 diff)
• steps/addressbook/show.inc (modified) (1 diff)

branches/devel-addressbook/program/include/rcube_shared.inc

@@ -486 +486 @@
 }
 
+
+/**
+ * Detect image type of the given binary data by checking magic numbers
+ *
+ * @param string  Binary file content
+ * @return string Detected mime-type or jpeg as fallback
+ */
+function rc_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;
+}
+
+
 /**
  * A method to guess encoding of a string.

branches/devel-addressbook/program/steps/addressbook/show.inc

@@ -43 +43 @@
     }
     
-    // check some magic numbers to detect image type
-    $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';
-    
-    header('Content-Type: image/' . $type);
+    header('Content-Type: ' . rc_image_content_type($data));
     echo $data ? $data : file_get_contents('program/blank.gif');
     exit;