Changeset 4298 in subversion

Timestamp:

Dec 1, 2010 2:39:36 PM (2 years ago)

Author:

thomasb

Message:

Handle both binary and base64 encoded photo values

Location:

branches/devel-addressbook/program

Files:

• include/rcube_vcard.php (modified) (1 diff)
• steps/addressbook/func.inc (modified) (1 diff)
• steps/addressbook/show.inc (modified) (1 diff)

branches/devel-addressbook/program/include/rcube_vcard.php

@@ -234 +234 @@
         break;
         
+      case 'photo':
+        $encoded = base64_decode($value, true) ? true : false;
+        $this->raw['PHOTO'][] = array(0 => $encoded ? $value : base64_encode($value), array('BASE64'));
+        break;
+        
       case 'email':
         $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type)));

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

@@ -325 +325 @@
             if ($coltypes['photo']) {
                 if ($record['photo'])
-                    $pic_img = $browser->imgdata ? 'data:image/jpeg;base64,' . $data : $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $_REQUEST['_source']));
+                    $pic_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $_REQUEST['_source']));
                 $img = html::img(array('src' => $pic_img, 'border' => 1, 'alt' => ''));
                 if ($edit_mode) {

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

@@ -29 +29 @@
 if ($RCMAIL->action == 'photo') {
     if ($record['photo']) {
-        // assume image/jpg base64 encoded
-        $data = base64_decode(is_array($record['photo']) ? $record['photo'][0] : $record['photo'], true);
+        $data = is_array($record['photo']) ? $record['photo'][0] : $record['photo'];
+        if (!preg_match('![^a-z0-9/+-]!i', $data))
+            $data = base64_decode($data, true);
     }
     
-    header('Content-Type: image/jpeg');
+    // 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 = 'png';
+    //else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data))
+    //    $type = 'jpeg';
+    
+    header('Content-Type: image/' . $type);
     echo $data ? $data : file_get_contents('program/blank.gif');
     exit;