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

Timestamp:

May 22, 2006 5:29:19 AM (18 years ago)

Author:

scdev

Message:

Q - Added "sc-" to all css class selectors; Finished reworking Upload and ImageThumb? (now with GD support!); More PHP 5 upgrades.

File:

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

trunk/lib/ImageThumb.inc.php

@@ -194 +194 @@
         if (isset($index) && isset($this->image_specs[$index])) {
             // Merge with previous.
-            $this->image_specs[$index] = array_merge($this->image_specs[$index], $spec);
+            $final_spec = array_merge($this->image_specs[$index], $spec);
+            $this->image_specs[$index] = $final_spec;
         } else {
             // Merge with defaults.
-            $this->image_specs[] = array_merge($this->default_image_specs, $spec);            
-        }
+            $final_spec = array_merge($this->default_image_specs, $spec);            
+            $this->image_specs[] = $final_spec;
+        }
+        
+        return $final_spec;
     }
 
@@ -207 +211 @@
      * @return  bool true on success, false on failure.
      */
-    function processAll()
+    function processAll($runtime_specs=null)
     {
         // Ensure we have a source.
@@ -228 +232 @@
             $return_val = 0;
             foreach ($files as $file_name) {
-                $return_val += $this->processFile($file_name);
+                $return_val += $this->processFile($file_name, $runtime_specs);
             }
             $this->_raiseMsg(sprintf(_("Resized %s images."), sizeof($files)), MSG_SUCCESS, __FILE__, __LINE__);
@@ -243 +247 @@
      * @access  public
      * @param   string $file_name Name of file with extention.
+     * @param   array $runtime_specs Array of specifications that will override all configured specifications.
      * @return  bool true on success, false on failure.
      */
-    function processFile($file_name)
+    function processFile($file_name, $runtime_specs=null)
     {
         // Source file determinted by provided file_name.
@@ -252 +257 @@
         // Ensure we have a source.
         if (sizeof($this->image_specs) < 1) {
-            App::logMsg(sprintf('Image specifications not set before processing.'), LOG_ERR, __FILE__, __LINE__);
-            return false;
+            if (is_array($runtime_specs)) {
+                $this->setSpec($runtime_specs, 0);
+            } else {
+                App::logMsg(sprintf('Image specifications not set before processing.'), LOG_ERR, __FILE__, __LINE__);
+                return false;                
+            }
         }
 
@@ -265 +274 @@
         if (!file_exists($source_file)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s was not found."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image not found: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
+            App::logMsg(sprintf('Source image not found: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -272 +281 @@
         if (!is_readable($source_file)) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s is not readable."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image not readable: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
+            App::logMsg(sprintf('Source image not readable: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -279 +288 @@
         if (filesize($source_file) <= 0) {
             $this->_raiseMsg(sprintf(_("Image resizing failed: source image %s is zero bytes."), $file_name), MSG_ERR, __FILE__, __LINE__);
-            App::logMsg(sprintf('Source image is zero bytes: %s', $file_name), LOG_ALERT, __FILE__, __LINE__);
+            App::logMsg(sprintf('Source image is zero bytes: %s', $source_file), LOG_ALERT, __FILE__, __LINE__);
             return false;
         }
@@ -286 +295 @@
         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', $file_name), LOG_ERR, __FILE__, __LINE__);
+            App::logMsg(sprintf('Image resizing failed: source image not of valid type: %s', $source_file), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -295 +304 @@
         // To keep this script running even if user tries to stop browser.
         ignore_user_abort(true);
-        if (!ini_get('safe_mode')) {
-            set_time_limit(300);
-        }
+        ini_set('max_execution_time', 300);
+        ini_set('max_input_time', 300);
 
         // This remains zero until something goes wrong.
         $return_val = 0;
 
-        foreach ($this->image_specs as $spec) {
+        foreach ($this->image_specs as $index => $spec) {
+            
+            if (is_array($runtime_specs)) {
+                // Override with runtime specs.
+                $spec = $this->setSpec($runtime_specs, $index);
+            }
             
             // Destination filename uses the extention defined by dest_file_extention.
@@ -558 +571 @@
             }
         }
-        $this->_raiseMsg(sprintf(_("The thumbnails for file <strong>%s</strong> have been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
+        $this->_raiseMsg(sprintf(_("The thumbnails for file %s have been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
         return 0 === $return_val;
     }
@@ -582 +595 @@
             return false;
         }
-        $this->_raiseMsg(sprintf(_("The original file <strong>%s</strong> has been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
+        $this->_raiseMsg(sprintf(_("The original file %s has been deleted."), $file_name), MSG_SUCCESS, __FILE__, __LINE__);
         return true;
     }
@@ -615 +628 @@
     {
         preg_match('/.*?\.(\w+)$/i', $file_name, $ext);
-        return in_array(strtolower($ext[1]), $this->getParam('valid_file_extensions'));
+        return !empty($ext) && in_array(strtolower($ext[1]), $this->getParam('valid_file_extensions'));        
     }