Changeset 278 for trunk

Timestamp:

Aug 1, 2007 3:44:58 AM (17 years ago)

Author:

quinn

Message:

Fixed web-uploaded image thumbnailing

File:

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

trunk/lib/ImageThumb.inc.php

@@ -345 +345 @@
         // Ensure destination directories are created. This will only be called once per page load.
         if (!$this->_createDestDirs()) {
+            $app->logMsg('Image resizing failed: unable to create dest dirs.', LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -761 +762 @@
                 return false;
             }
-        
+
             // Loop through specs and ensure all dirs are created.
             foreach ($this->_image_specs as $spec) {
@@ -776 +777 @@
                 }
                 if (!file_exists($dest_dir)) {
+                    $app->logMsg(sprintf('Creating dest dir: %s', $dest_dir), LOG_DEBUG, __FILE__, __LINE__);
                     if (phpversion() > '5') {
                         // Recursive.
@@ -785 +787 @@
                         // Recursive mkdir for php 4.
                         $path = '';
+                        $depth = 0;
+                        $ret = true;
                         foreach (array_diff(explode('/', $dest_dir), array('')) as $dir) {
                             $path .= '/' . $dir;
-                            if (! ($ret = file_exists($path) ? true : mkdir($path, $this->getParam('dest_dir_perms')))) {
+                            $depth++;
+                            /// FIXME: This is a dirty way to make this work when open_basedir prevents looking at the first 3 directories in an absolute path.
+                            if ($depth > 3 && !($ret = file_exists($path) ? true : mkdir($path, $this->getParam('dest_dir_perms')))) {
                                 $return_val++;
                                 $app->logMsg(sprintf('mkdir failure: %s', $path), LOG_ERR, __FILE__, __LINE__);
                                 break;
+                            } else {
+                                $app->logMsg(sprintf('mkdir attempt: %s', $path), LOG_DEBUG, __FILE__, __LINE__);
                             }
                         }
@@ -798 +806 @@
                         $app->logMsg(sprintf('mkdir success: %s', $dest_dir), LOG_DEBUG, __FILE__, __LINE__);                        
                     }
+                } else {
+                    $app->logMsg(sprintf('Dest dir exists: %s', $dest_dir), LOG_DEBUG, __FILE__, __LINE__);
                 }
             }