php-blog-cvs

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15958/include

Modified Files:
	functions_images.inc.php 
Log Message:
touch up sebastians commit; only display img tags if the file is an image, $imgsrc may also be set for other file types.
create a function to check for an image.


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions_images.inc.php	5 Dec 2004 15:05:48 -0000	1.6
+++ functions_images.inc.php	6 Dec 2004 11:09:36 -0000	1.7
@@ -269,7 +269,7 @@
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
 
     foreach ($serendipity['imageList'] as $k => $file) {
-        $is_image = (0 === strpos(strtolower($file['mime']), "image/"));
+        $is_image = serendipity_isImage($file);
 
         if ($is_image) {
             $update   = false;
@@ -810,19 +810,15 @@
         foreach ($serendipity['imageList'] as $k => $file) {
             ++$x; $preview = '';
             $i      = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
-            $imgsrc = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
-	    if ($file['mime'] == 'application/pdf') {
-	       // File is PDF -> Thumb is PNG
-	       $imgsrc .= '.png';
-	    }
-            $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
+            $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+            $is_image = serendipity_is_image($file);
 
-            if (file_exists($imgsrc)) {
-                $preview .= '<img src="' . $imgsrc . '" border="0" alt="'. $file['name'] . '" />';
+            if (!$is_image) {
+                $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';
                 if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
             }
 
-            if (!file_exists($imgsrc)) {
+            if (!file_exists($file['imgsrc'])) {
                 $preview .= '<div class="serendipity_admin_mimetype" style="width: ' . $serendipity['thumbSize'] . 'px; height: ' . $serendipity['thumbSize'] . 'px; border: 1px solid; text-align: center;"><br /><br /><br />' . $file['mime'];
                 if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
                 $preview .= '</div>';
@@ -890,6 +886,18 @@
 }
 } // End serendipity_displayImageList()
 
+function serendipity_isImage(&$file) {
+    $file['displaymime'] = $file['mime'];
+
+    // File is PDF -> Thumb is PNG
+    if ($file['mime'] == 'application/pdf') {
+       $file['imgsrc']     .= '.png';
+       $file['displaymime'] = 'image/png';
+    }
+
+    return (0 === strpos(strtolower($file['displaymime']), 'image/'));
+}
+
 function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
 static $n = "<br />\n";
 static $serious = true;