Changeset 320 for trunk/lib

Timestamp:

Mar 21, 2008 10:20:11 AM (16 years ago)

Author:

quinn

Message:

Added a glob function to the ImageThumb? deleteThumbs method. Fixed some HTML errors. Minor admin2 CSS tweaks.

Location:

trunk/lib

Files:

• ImageThumb.inc.php (modified) (5 diffs)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/ImageThumb.inc.php

@@ -638 +638 @@
      *
      * @access  public
-     * @param   string $file_name The file name to delete, with extension.
+     * @param   string  $file_name  The file name to delete, with extension.
+     * @param   bool    $use_glob   Set true to use glob to find the filename (using $file_name as a pattern)
      * @return  bool true on success, false on failure.
      */
-    function deleteThumbs($file_name)
+    function deleteThumbs($file_name, $use_glob=false)
     {
         $app =& App::getInstance();
@@ -653 +654 @@
         $return_val = 0;
         foreach ($this->_image_specs as $spec) {
-            if ('/' == $spec['dest_dir']{0}) {
-                // Absolute path.
-                $dest_file = realpath(sprintf('%s/%s.%s', $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));                
+            // Get base directory depending on if the spec's dest_dir is an absolute path or not.
+            $dest_dir = '/' == $spec['dest_dir']{0} ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
+            if ($use_glob) {
+                $dest_file = realpath(sprintf('%s/%s', $dest_dir, $this->_glob($file_name, $dest_dir)));                
             } else {
-                // Relative path.
-                $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));
-            }
+                $dest_file = realpath(sprintf('%s/%s.%s', $dest_dir, mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));
+            }            
+            
             if (file_exists($dest_file)) {
                 if (!unlink($dest_file)) {
@@ -667 +669 @@
             }
         }
-        $app->logMsg(sprintf('Thumbnails deleted for file: %s', $file_name), LOG_INFO, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Thumbnails deleted for file: %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
         return 0 === $return_val;
     }
@@ -766 +768 @@
                     $dest_dir = dirname($filename);
                 } else {
-                    if ('/' == $spec['dest_dir']{0}) {
-                        // Absolute path.
-                        $dest_dir = $spec['dest_dir'];
-                    } else {
-                        // Relative path.
-                        $dest_dir = sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
-                    }
+                    // Get base directory depending on if the spec's dest_dir is an absolute path or not.
+                    $dest_dir = '/' == $spec['dest_dir']{0} ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
                 }
                 if (!file_exists($dest_dir)) {
@@ -835 +832 @@
         }
     }
+    
+    /**
+     * Get filename by glob pattern. Searches a directory for an image that matches the
+     * specified glob pattern and returns the filename of the first file found.
+     *
+     * @access  public
+     * @param   string  $pattern    Pattern to match filename.
+     * @param   string  $directory  Pattern to match containing directory.
+     * @return  string filename on success, empty string on failure.
+     * @author  Quinn Comendant <quinn@strangecode.com>
+     * @since   15 Nov 2005 20:55:22
+     */
+    function _glob($pattern, $directory)
+    {
+        $file_list = glob(sprintf('%s/%s', $directory, $pattern));
+        if (isset($file_list[0])) {
+            return basename($file_list[0]);
+        } else {
+            return '';
+        }
+    }
 
 } // End of class.

trunk/lib/Utilities.inc.php

@@ -108 +108 @@
 /**
  * Returns text with stylistic modifications. Warning: this will break some HTML attibutes!
- * TODO: Allow a string such as this to be passted: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
+ * TODO: Allow a string such as this to be passed: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
  *
  * @param  string   $text Text to clean.