[php-blog-cvs] serendipity/include/admin images.inc.php,1.16,1.17

[Tom S. <tom...@us...>]

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

Modified Files:
	images.inc.php 
Log Message:
- Clean up serendipity_makeThumbnail() and don't insert image into database from it. Instead serendipity_insertImageInDatabase has to be called "manually" after an image is done being processed.
- serendipity_insertImageInDatabase() now requires far less arguments, as it can calculate them on its own
- Fix E_NOTICE for non-string array element when mime is application/pdf
- Let serendipity_getImageSize do mime calc, so we don't need to clutter the rest of the code with serendipity_guessMime

The latter might need a little tweaking


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- images.inc.php	6 Feb 2005 01:04:52 -0000	1.16
+++ images.inc.php	9 Feb 2005 19:46:10 -0000	1.17
@@ -139,9 +139,11 @@
                 printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory']) ) {
                     echo THUMB_CREATED_DONE . '<br />';
                 }
+                // Insert into database
+                $image_id = serendipity_insertImageInDatabase($_FILES['userfile']['name'], $directory, $authorid);
             }
         }
     } else {
@@ -170,9 +172,11 @@
                 @chmod($target, 0664);
 
                 // Create thumbnail
-                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory']) ) {
                     echo THUMB_CREATED_DONE . '<br />';
                 }
+                // Insert into database
+                $image_id = serendipity_insertImageInDatabase($_FILES['userfile']['name'], $directory, $authorid);
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
             }