Changeset 154 for trunk/lib/ImageThumb.inc.php

Timestamp:

Jun 8, 2006 5:36:10 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/ImageThumb.inc.php (modified) (3 diffs)

trunk/lib/ImageThumb.inc.php

@@ -320 +320 @@
         if (!$this->_validFileExtension($file_name)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s not a valid type. It must have one of the following file name extensions: %s"), $file_name, join(', ', $this->getParam('valid_file_extensions'))), MSG_ERR, __FILE__, __LINE__);
-            $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -382 +382 @@
             if (IMAGETHUMB_METHOD_NETPBM === $this->getParam('resize_method') && file_exists($this->getParam('anytopnm_binary')) && file_exists($this->getParam('pnmscale_binary')) && file_exists($this->getParam('cjpeg_binary'))) {
                 // Resize using Netpbm binaries.
-                $app->logMsg(sprintf('Resizing with Netpbm: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                // $app->logMsg(sprintf('Resizing with Netpbm: %s', $source_file), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithNetpbm($source_file, $dest_file, $spec);
             } else if (IMAGETHUMB_METHOD_GD === $this->getParam('resize_method') && extension_loaded('gd')) {
                 // Resize with GD.
-                $app->logMsg(sprintf('Resizing with GD: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
+                // $app->logMsg(sprintf('Resizing with GD: %s', $source_file), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithGD($source_file, $dest_file, $spec);
             } else {
@@ -739 +739 @@
                 }
                 if (!file_exists($dest_dir)) {
-                    if (phpversion() > '5' && false) { ///
+                    if (phpversion() > '5') {
                         // Recursive.
-                        if (! ($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
+                        if (!file_exists($dest_dir) && !($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
                             $return_val++;
                             $app->logMsg(sprintf('mkdir failure: %s', $dest_dir), LOG_ERR, __FILE__, __LINE__);