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

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

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

Modified Files:
	images.inc.php 
Log Message:
- Fix imagick not rotating in the right direction (apparently gdlib and imagick doesn't agree on which direction to rotate in)
- Escape arguments and commands used when executing imagick, to avoid evil command injections
- Emit error if imagick execution failed
- Don't echo that we've created a thumbnail, when the creation failed


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- images.inc.php	3 Feb 2005 18:55:19 -0000	1.15
+++ images.inc.php	6 Feb 2005 01:04:52 -0000	1.16
@@ -139,8 +139,9 @@
                 printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                $created_thumbnail = serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
-                echo THUMB_CREATED_DONE . '<br />';
+                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                    echo THUMB_CREATED_DONE . '<br />';
+                }
             }
         }
     } else {
@@ -169,8 +170,9 @@
                 @chmod($target, 0664);
 
                 // Create thumbnail
-                $created_thumbnail = serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
-                echo THUMB_CREATED_DONE . '<br />';
+                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                    echo THUMB_CREATED_DONE . '<br />';
+                }
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
             }