Changeset 313

Timestamp:

Feb 1, 2008 1:38:06 AM (16 years ago)

Author:

quinn

Message:

Fixed bug that would cause a logging error.

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• ImageThumb.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -847 +847 @@
         }
 
-        // For each existing POST value, we create a hidden input to carry it through a form.
+        // For each existing request value, we create a hidden input to carry it through a form.
         if ($do_carry_queries) {
             // Join the global _carry_queries and local one_time_carry_queries.

trunk/lib/ImageThumb.inc.php

@@ -274 +274 @@
             $return_val = 0;
             foreach ($files as $file_name) {
-                $return_val += $this->processFile($file_name, $runtime_specs);
-            }
+                $return_val += (false === $this->processFile($file_name, $runtime_specs) ? 1 : 0);
+            }
+            $this->_raiseMsg(sprintf(_("Resized %s images."), sizeof($files)), MSG_SUCCESS, __FILE__, __LINE__);
             $this->_raiseMsg(sprintf(_("Resized %s images."), sizeof($files)), MSG_SUCCESS, __FILE__, __LINE__);
             return 0 === $return_val;
@@ -567 +568 @@
             $app->logMsg(sprintf('Source image type %s not supported.', $source_image_type), LOG_WARNING, __FILE__, __LINE__);
             return 1;
-            break;
         }
         if (!$source_image_resource) {
@@ -579 +579 @@
         // Resample!
         if (!imagecopyresampled($dest_image_resource, $source_image_resource, 0, 0, 0, 0, $dest_image_width, $dest_image_height, $source_image_width, $source_image_height)) {
-            $app->logMsg(sprintf('Error resampling image %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             // Always cleanup images from memory.
             imagedestroy($source_image_resource);
             imagedestroy($dest_image_resource);
+            $app->logMsg(sprintf('Error resampling image %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return 1;
         }
@@ -625 +625 @@
             // Make the thumbnail writable so the user can delete it over ftp without being 'apache'.
             if (!chmod($dest_file, $this->getParam('dest_file_perms'))) {
-                $app->logMsg(sprintf('chmod failed on file: %s', $dest_file), LOG_ERR, __FILE__, __LINE__);
+                $app->logMsg(sprintf('chmod failed on file: %s', $dest_file), LOG_NOTICE, __FILE__, __LINE__);
             }
             $app->logMsg(sprintf('Successfully resized image: %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);