Changeset 626

Timestamp:

May 13, 2018 6:11:10 AM (6 years ago)

Author:

anonymous

Message:

Fix setSpec validation

File:

• trunk/lib/ImageThumb.inc.php (modified) (1 diff)

trunk/lib/ImageThumb.inc.php

@@ -222 +222 @@
             }
         }
-        if (!isset($spec['width']) || !is_int($spec['width'])) {
-            $app->logMsg('setSpec error: width not specified.', LOG_ERR, __FILE__, __LINE__);
-        }
-        if (!isset($spec['height']) || !is_int($spec['height'])) {
-            $app->logMsg('setSpec error: height not specified.', LOG_ERR, __FILE__, __LINE__);
+        if (IMAGETHUMB_FIT_HEIGHT != $spec['scaling_type'] && (!isset($spec['width']) || !is_numeric($spec['width']))) {
+            $app->logMsg(sprintf('setSpec error: invalid width: %s', $spec['width']), LOG_ERR, __FILE__, __LINE__);
+        }
+        if (IMAGETHUMB_FIT_WIDTH != $spec['scaling_type'] && (!isset($spec['height']) || !is_numeric($spec['height']))) {
+            $app->logMsg(sprintf('setSpec error: invalid height: %s', $spec['height']), LOG_ERR, __FILE__, __LINE__);
         }
         if (isset($spec['quality']) && IMG_JPG != $spec['dest_file_type']) {
-            $app->logMsg('The "quality" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg('The "quality" specification is not used unless IMG_JPG is the dest_file_type.', LOG_NOTICE, __FILE__, __LINE__);
         }
         if (isset($spec['progressive']) && IMG_JPG != $spec['dest_file_type']) {
-            $app->logMsg('The "progressive" specification is not used unless IMG_JPG is the dest_file_type.', LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg('The "progressive" specification is not used unless IMG_JPG is the dest_file_type.', LOG_NOTICE, __FILE__, __LINE__);
         }