Changeset 3018 for branches/2.2/expressoMail1_2/inc/show_thumbs.php

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/inc/show_thumbs.php (modified) (2 diffs)

branches/2.2/expressoMail1_2/inc/show_thumbs.php

@@ -1 +1 @@
 <?php
-if(!isset($GLOBALS['phpgw_info'])){
-        $GLOBALS['phpgw_info']['flags'] = array(
-                'currentapp' => 'expressoMail1_2',
-                'nonavbar'   => true,
-                'noheader'   => true
-        );
-}
-require_once '../../header.inc.php';
 
+        require_once '../../header.session.inc.php'; 
         $username = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
         $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
@@ -31 +24 @@
         $image_mail = imap_fetchbody($mb, $msg_num, $msg_part, FT_UID);
         $image = imap_base64($image_mail);
-        $image = imagecreatefromstring ($image);
-        
-        header("Content-Type: ".$file_type);
-        header("Content-Disposition: inline");
- 
-        $pic = $image;
-    if ($pic) {
-        $width = imagesx($pic);
-        $height = imagesy($pic);
-        $twidth = 160; # width of the thumb 160 pixel
-        $theight = $twidth * $height / $width; # calculate height
-        $thumb = imagecreatetruecolor ($twidth, $theight);
+        $pic = @imagecreatefromstring ($image);
+        if($pic !== FALSE) { 
+                header("Content-Type: ".$file_type); 
+                header("Content-Disposition: inline");
+                $width = imagesx($pic);
+                $height = imagesy($pic);
+                $twidth = 160; # width of the thumb 160 pixel
+                $theight = $twidth * $height / $width; # calculate height
+                $theight =  $theight < 1 ? 1 : $theight; 
+                $thumb = imagecreatetruecolor ($twidth, $theight);
                 imagecopyresized($thumb, $pic, 0, 0, 0, 0,$twidth, $theight, $width, $height); # resize image into thumb
                 imagejpeg($thumb,"",75); # Thumbnail as JPEG
-    }
+        }
 ?>