[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.35,1.36

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

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

Modified Files:
	serendipity_admin_image_selector.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: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_admin_image_selector.php	5 Dec 2004 15:05:50 -0000	1.35
+++ serendipity_admin_image_selector.php	6 Dec 2004 11:09:37 -0000	1.36
@@ -79,21 +79,21 @@
         }
 
         $file          = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
-        $imgsrc        = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $file['imgsrc']= $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
         $imgName       = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
         $thumbbasename = $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
         $thumbName     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $thumbbasename;
         $thumbsize     = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
-        $is_image      = (preg_match('@^image/@i', $file['mime']) ? true : false);
+        $is_image      = serendipity_isImage($file);
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
 
 <div>
 <?php
-        if (!file_exists($imgsrc)) {
+        if (!file_exists($file['imgsrc'])) {
 ?>
-    <img align="right" src="<?php echo $imgsrc; ?>">
+    <img align="right" src="<?php echo $file['imgsrc']; ?>">
     <h1><?php printf(YOU_CHOSE, $file['name']); ?></h1>
     <p>
         <form action="#" method="GET" name="serendipity[selForm]" onSubmit="serendipity_imageSelector_done()">