Changeset 152

Timestamp:

Jun 7, 2006 5:35:16 AM (18 years ago)

Author:

scdev

Message:

Q - In the middle of working on the Prefs and Cache instantiation mode...can't decide to use singleton pattern or global vars. Updated ImageThumb? to allow filenames with path elements such as 01/23/4567_file.jpg.

Location:

trunk

Files:

• bin/module_maker/skel/admin.php (modified) (14 diffs)
• lib/Cache.inc.php (modified) (9 diffs)
• lib/ImageThumb.inc.php (modified) (23 diffs)
• lib/PageNumbers.inc.php (modified) (4 diffs)
• lib/Prefs.inc.php (modified) (9 diffs)
• lib/SortOrder.inc.php (modified) (5 diffs)
• lib/Upload.inc.php (modified) (2 diffs)
• services/admins.php (modified) (10 diffs)
• services/logs.php (modified) (6 diffs)
• services/templates/log_list.ihtml (modified) (1 diff)

trunk/bin/module_maker/skel/admin.php

@@ -14 +14 @@
 
 require_once 'codebase/lib/PageNumbers.inc.php';
-require_once 'codebase/lib/SessionCache.inc.php';
+require_once 'codebase/lib/Cache.inc.php';
 require_once 'codebase/lib/FormValidator.inc.php';
 require_once 'codebase/lib/SortOrder.inc.php';
@@ -33 +33 @@
 $fv = new FormValidator();
 
-$cache =& Cache::getInstance();
+// Configure the prefs object.
+$prefs =& Prefs::getInstance('%NAME_PLURAL%');
+$prefs->setParam(array('persistent' => false));
+
+// Configure the cache object.
+$cache =& Cache::getInstance('%NAME_PLURAL%');
+$cache->setParam(array('enable' => true));
 
 %SORT_ORDER%
 
-// Instantiate page numbers. Total items are set and calculation is done in the getRecordList function.
+// Instantiate page numbers. Total items are set and calculation is done in the getCachedList function.
 $page = new PageNumbers();
 $page->setPerPage(getFormData('per_page'), 100);
@@ -57 +63 @@
 
 if (getFormData('break_list_cache', false)) {
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 }
 
@@ -171 +177 @@
 default :
 //     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_LIST, _("Permission to view %NAME_PLURAL% list denied."));
-    $list =& getRecordList();
+    $list =& getCachedList();
     $main_template = '%ADMIN_LIST_TEMPLATE%';
     break;
@@ -250 +256 @@
     global $lock;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
@@ -257 +263 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // Get the information for this object.
@@ -285 +291 @@
     global $auth;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
 %INSERT%
@@ -306 +312 @@
     global $auth, $lock;
     $app =& App::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
@@ -313 +319 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
 %UPDATE%
@@ -328 +334 @@
 }
 
-function &getRecordList()
+function &getCachedList()
 {
     global $page;
     global $so;
-    $db =& DB::getInstance();
-    $prefs =& Prefs::getInstance();
-    $cache =& Cache::getInstance();
-    
+    $db =& DB::getInstance();   
+    $prefs =& Prefs::getInstance('%NAME_PLURAL%');
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
+    
     $where_clause = '';
 
@@ -377 +383 @@
     ";
 
+    // Use a cash hash to determine if the result-set has changed.
     // A unique key for this query, with the total_items in case db records
     // were added since the last cache. This identifies a unique set of
@@ -383 +390 @@
     // without knowing the hash.
     $cache_hash = md5($sql . '|' . $page->total_items);
-    if ($prefs->get('cache_hash', $_SERVER['PHP_SELF']) != $cache_hash) {
-        $cache->delete($_SERVER['PHP_SELF']);
-        $prefs->set('cache_hash', $cache_hash, $_SERVER['PHP_SELF']);
-    }
-
-    if ($cache->exists($_SERVER['PHP_SELF'])) {
-        // Get the cached results.
-        $list = $cache->get($_SERVER['PHP_SELF']);
-    } else {
-        // If the list is not already cached, query now.
-        $qid = $db->query($sql);
-        // Fill an array with the items for this page.
-        while ($row = mysql_fetch_assoc($qid)) {
-            $list[] = $row;
-        }
-
-        if (isset($list) && !empty($list)) {
-            // Cache the results.
-            $cache->set($list, $_SERVER['PHP_SELF']);
-        }
+    if ($prefs->get('cache_hash') != $cache_hash) {
+        $cache->delete('list');
+        $prefs->set('cache_hash', $cache_hash);
+    }
+
+    // First try to return from the cache.
+    if ($cache->exists('list')) {
+        return $cache->get('list');
+    }
+    
+    // The list was not cached, so issue the real query.
+    $qid = $db->query($sql);
+    while ($row = mysql_fetch_assoc($qid)) {
+        $list[] = $row;
+    }
+
+    // Save this list into the cache.
+    if (isset($list) && !empty($list)) {
+        $cache->set('list', $list);
     }
 
@@ -411 +417 @@
 {
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     if (!is_array($ranks)) {
@@ -418 +424 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // Count the ranks with invalid numbers

trunk/lib/Cache.inc.php

@@ -13 +13 @@
  
 // Flags.
-define('CACHE_IGNORE_SIZE', 1);
+define('CACHE_ALLOW_OVERSIZED', 1);
 
 class Cache {
 
+    // Namespace of this instance of Prefs.
+    var $_ns;
+
+    // Configuration parameters for this object.
     var $_params = array(
+        
+        // If false nothing will be cached or retreived. Useful for testing realtime data requests.
         'enabled' => true,
-        'soft_limit' => 204800,
-        'hard_limit' => 4194304,
-        'min_items' => 3,
+
+        // The maximum size in bytes of any one variable.
+        'item_size_limit' => 4194304, // 4 MB
+        
+        // The maximum size in bytes before the cache will begin flushing out old items.
+        'stack_size_limit' => 4194304, // 4 MB
+        
+        // The minimum items to keep in the cache regardless of item or cache size.
+        'min_items' => 5,
     );
+    
+    /*
+    * Constructor
+    *
+    * @access   public
+    * @param    string  $namespace  This object will store data under this realm.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    05 Jun 2006 23:14:21
+    */
+    function Cache($namespace='')
+    {
+        $this->_ns = '_cache' . $namespace;
+        
+        if (!isset($_SESSION[$this->_ns])) {
+            $this->clear();
+        }
+    }
 
     /**
@@ -31 +61 @@
      * @static
      */
-    function &getInstance()
-    {
-        static $instance = null;
-
-        if ($instance === null) {
-            $instance = new Cache();
-        }
-
-        return $instance;
+    function &getInstance($namespace='')
+    {
+        static $instances = array();
+
+        if (!array_key_exists($namespace, $instances)) {
+            $instances[$namespace] = new Cache($namespace);
+        }
+
+        return $instances[$namespace];
     }
 
@@ -81 +111 @@
     /**
      * Stores a new variable in the session cache. The $key is is md5'ed
-     * because if a variable id is a very large integer, the array_shift function
+     * because if a key is numeric, the array_shift function
      * will reset the key to the next largest int key. Weird behavior I can't
-     * understand. $session_cache[32341234123] will become $session_cache[0]
-     * for example. Usage warning: if the variable is too big to fit, or is
-     * old and discarded, you must provide alternative ways of accessing the data.
+     * understand. For example $cache["123"] will become $cache[0]
      *
      * @param str   $key        An identifier for the cached object.
-     * @param mixed $var          The var to store in the session cache.
+     * @param mixed $var        The var to store in the session cache.
      * @param bool  $flags      If we have something really big that we
-     *                            still want to cache, setting this to
-     *                            CACHE_IGNORE_SIZE allows this.
-     *
-     * @return bool               True on success, false otherwise.
+     *                          still want to cache, setting this to
+     *                          CACHE_ALLOW_OVERSIZED allows this.
+     * @return bool             True on success, false otherwise.
      */
     function set($key, $var, $flags=0)
@@ -99 +126 @@
         $app =& App::getInstance();
 
-        if (!$this->getParam('enabled')) {
+        if (true !== $this->getParam('enabled')) {
             $app->logMsg(sprintf('Cache not enabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
@@ -105 +132 @@
 
         $key = md5($key);
-        $serialized_var = serialize($var);
-        $serialized_var_len = strlen($serialized_var);
-
-        if ($flags & CACHE_IGNORE_SIZE > 0 && $serialized_var_len >= $this->getParam('soft_limit')) {
-            $app->logMsg(sprintf('Serialized variable (%s bytes) more than soft_limit (%s bytes).', $serialized_var_len, $this->getParam('soft_limit')), LOG_NOTICE, __FILE__, __LINE__);
-            return false;
-        }
-
-        if ($serialized_var_len >= $this->getParam('hard_limit')) {
-            $app->logMsg(sprintf('Serialized variable (%s bytes) more than hard_limit (%s bytes).', $serialized_var_len, $this->getParam('hard_limit')), LOG_NOTICE, __FILE__, __LINE__);
-            return false;
-        }
-
-        if (!isset($_SESSION['_session_cache'])) {
-            $_SESSION['_session_cache'] = array();
-        } else {
-            unset($_SESSION['_session_cache'][$key]);
-            // Continue to prune the cache if it's length is too long for the new variable to fit, but keep at least MIN_ITEMS at least.
-            while (strlen(serialize($_SESSION['_session_cache'])) + $serialized_var_len >= $this->getParam('soft_limit')
-            && sizeof($_SESSION['_session_cache']) >= $this->getParam('min_items')) {
-                array_shift($_SESSION['_session_cache']);
-            }
-        }
-        $_SESSION['_session_cache'][$key] =& $serialized_var;
-
-        if ($serialized_var_len >= 1024000) {
-            $app->logMsg(sprintf('Successfully cached oversized variable (%s bytes).', $serialized_var_len), LOG_DEBUG, __FILE__, __LINE__);
+        $var = serialize($var);
+        $var_len = strlen($var);
+
+        if ($var_len >= $this->getParam('item_size_limit')) {
+            $app->logMsg(sprintf('Serialized variable (%s bytes) more than item_size_limit (%s bytes).', $var_len, $this->getParam('item_size_limit')), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }
+
+        if ($flags & CACHE_ALLOW_OVERSIZED == 0 && $var_len >= $this->getParam('stack_size_limit')) {
+            $app->logMsg(sprintf('Serialized variable (%s bytes) more than stack_size_limit (%s bytes).', $var_len, $this->getParam('stack_size_limit')), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }        
+
+        // Remove any value already stored under this key.
+        unset($_SESSION[$this->_ns][$key]);
+
+        // Continue to prune the cache if its size is greater than stack_size_limit, but keep at least min_items.
+        while (strlen(serialize($_SESSION[$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION[$this->_ns]) >= $this->getParam('min_items')) {
+            array_shift($_SESSION[$this->_ns]);
+        }
+
+        // Save this value under the specified key.
+        $_SESSION[$this->_ns][$key] =& $var;
+
+        if ($var_len >= 1024000) {
+            $app->logMsg(sprintf('Successfully cached oversized variable (%s bytes).', $var_len), LOG_DEBUG, __FILE__, __LINE__);
         }
 
@@ -144 +170 @@
      *
      * @param string $key  The key for the datum to retrieve.
-     *
      * @return mixed          The requested datum, or false on failure.
      */
     function get($key)
     {
-        if (!$this->getParam('enabled')) {
-            return false;
-        }
-
-        $key = md5($key);
-        if (isset($_SESSION['_session_cache'][$key])) {
+        if (true !== $this->getParam('enabled')) {
+            return false;
+        }
+
+        $key = md5($key);
+        if (isset($_SESSION[$this->_ns][$key])) {
             // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
-            $tmp =& $_SESSION['_session_cache'][$key];
-            unset($_SESSION['_session_cache'][$key]);
-            $_SESSION['_session_cache'][$key] =& $tmp;
+            $tmp =& $_SESSION[$this->_ns][$key];
+            unset($_SESSION[$this->_ns][$key]);
+            $_SESSION[$this->_ns][$key] =& $tmp;
             // Return the unserialized datum.
-            return unserialize($_SESSION['_session_cache'][$key]);
+            return unserialize($_SESSION[$this->_ns][$key]);
         } else {
             return false;
@@ -170 +195 @@
      *
      * @param string $key  The key of the object to check.
-     *
      * @return bool           The return from isset().
      */
     function exists($key)
     {
-        if (!$this->getParam('enabled')) {
-            return false;
-        }
-
-        $key = md5($key);
-        return isset($_SESSION['_session_cache'][$key]);
+        if (true !== $this->getParam('enabled')) {
+            return false;
+        }
+
+        $key = md5($key);
+        return array_key_exists($key, $_SESSION[$this->_ns]);
     }
 
@@ -187 +211 @@
      *
      * @param string $key  The key of the object to check.
-     *
      * @return bool           The return from isset().
      */
@@ -193 +216 @@
     {
         $key = md5($key);
-        if (isset($_SESSION['_session_cache'][$key])) {
-            unset($_SESSION['_session_cache'][$key]);
-        }
+        unset($_SESSION[$this->_ns][$key]);
+    }
+    
+    /*
+    * Delete all existing items from the cache.
+    *
+    * @access   public
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    05 Jun 2006 23:51:34
+    */
+    function clear()
+    {
+        $_SESSION[$this->_ns] = array();
     }
 

trunk/lib/ImageThumb.inc.php

@@ -9 +9 @@
  */
 
-// Image resize options.
+// Image proprtion options.
 define('IMAGETHUMB_FIT_WIDTH', 1);
 define('IMAGETHUMB_FIT_HEIGHT', 2);
@@ -15 +15 @@
 define('IMAGETHUMB_STRETCH', 4);
 define('IMAGETHUMB_NO_SCALE', 5);
+
+// Image resize options.
 define('IMAGETHUMB_METHOD_NETPBM', 6);
 define('IMAGETHUMB_METHOD_GD', 7);
@@ -32 +34 @@
 
         // Permissions of autocreated directories. Must be at least 0700 with owner=apache.
-        'dest_dir_perms' => 0777,
+        'dest_dir_perms' => 0700,
 
         // Require file to have one of the following file name extentions.
@@ -50 +52 @@
     
     // Default image size specs.
-    var $default_image_specs = array(
-        // The destination for an image thumbnail size. Path relative to source_dir (eg: ../thumbs).
+    var $_default_image_specs = array(
+        // The destination for an image thumbnail size. 
+        // Use initial / to specify absolute paths, leave off to specify a path relative to source_dir (eg: ../thumbs).
         'dest_dir' => null,
         
@@ -85 +88 @@
 
     // Final specifications for image sizes, set with setSpec().
-    var $image_specs = array();
+    var $_image_specs = array();
 
     /**
@@ -99 +102 @@
         if (isset($params) && is_array($params)) {
 
-            // Enforce valid upload_path parameter.
+            // Enforce valid source_dir parameter.
             if (isset($params['source_dir'])) {
                 $params['source_dir'] = realpath($params['source_dir']);
-                // Must be directory.
+                // Source must be directory.
                 if (!is_dir($params['source_dir'])) {
-                    $app->logMsg(sprintf('Source directory invalid: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
-                    trigger_error(sprintf('Source directory invalid: %s', $params['source_dir']), E_USER_ERROR);
-                }
-                // Must be readable.
+                    $app->logMsg(sprintf('Attempting to auto-create source directory: %s', $params['source_dir']), LOG_NOTICE, __FILE__, __LINE__);
+                    if (phpversion() > '5') {
+                        // Recursive.
+                        mkdir($params['source_dir'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
+                    } else {
+                        mkdir($params['source_dir'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
+                    }
+                    if (!is_dir($params['source_dir'])) {
+                        $app->logMsg(sprintf('Source directory invalid: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
+                        trigger_error(sprintf('Source directory invalid: %s', $params['source_dir']), E_USER_ERROR);
+                    }
+                }
+                // Source must be readable.
                 if (!is_readable($params['source_dir'])) {
                     $app->logMsg(sprintf('Source directory not readable: %s', $params['source_dir']), LOG_ERR, __FILE__, __LINE__);
@@ -151 +163 @@
 
         // A little sanity checking.
-        if (!isset($spec['dest_dir']) || '' == $spec['dest_dir']) {
+        if (!isset($spec['dest_dir']) || '' == trim($spec['dest_dir'])) {
             $app->logMsg('setSpec error: dest_dir not specified.', LOG_ERR, __FILE__, __LINE__);
+        } else {
+            $spec['dest_dir'] = trim($spec['dest_dir']);            
         }
         if (isset($spec['dest_file_type'])) {
@@ -198 +212 @@
         }
         
-        if (isset($index) && isset($this->image_specs[$index])) {
-            // Merge with previous.
-            $final_spec = array_merge($this->image_specs[$index], $spec);
-            $this->image_specs[$index] = $final_spec;
+        // Add to _image_specs array.
+        if (isset($index) && isset($this->_image_specs[$index])) {
+            // Merge with existing spec if index is provided.
+            $final_spec = array_merge($this->_image_specs[$index], $spec);
+            $this->_image_specs[$index] = $final_spec;
         } else {
-            // Merge with defaults.
-            $final_spec = array_merge($this->default_image_specs, $spec);            
-            $this->image_specs[] = $final_spec;
+            // Merge with spec defaults.
+            $final_spec = array_merge($this->_default_image_specs, $spec);            
+            $this->_image_specs[] = $final_spec;
         }
         
@@ -245 +260 @@
             return 0 === $return_val;
         } else {
-            $app->logMsg(sprintf('No images found to thumbnail in directory %s.', $this->getParam('source_dir')), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('No source images found in directory: %s', $this->getParam('source_dir')), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -266 +281 @@
         
         // Ensure we have a source.
-        if (sizeof($this->image_specs) < 1) {
+        if (sizeof($this->_image_specs) < 1) {
             if (is_array($runtime_specs)) {
                 $this->setSpec($runtime_specs, 0);
@@ -284 +299 @@
         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', $source_file), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image not found: %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -291 +306 @@
         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', $source_file), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image not readable: %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -298 +313 @@
         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', $source_file), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Source image is zero bytes: %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
@@ -310 +325 @@
 
         // Ensure destination directories are created. This will only be called once per page load.
-        $this->_createDestDirs();
+        if (!$this->_createDestDirs()) {
+            return false;
+        }
         
         // To keep this script running even if user tries to stop browser.
@@ -320 +337 @@
         $return_val = 0;
 
-        foreach ($this->image_specs as $index => $spec) {
+        foreach ($this->_image_specs as $index => $spec) {
             
             if (is_array($runtime_specs)) {
@@ -328 +345 @@
             
             // Destination filename uses the extention defined by dest_file_extention.
-            $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extention']));
+            if ('/' == $spec['dest_dir']{0}) {
+                // Absolute path.
+                $dest_file = sprintf('%s/%s.%s', $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extention']);
+            } else {
+                // Relative path.
+                $dest_file = sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extention']);
+            }
+                 
+            // Ensure destination directory exists and is writable.
+            if (!is_dir(dirname($dest_file)) || !is_writable(dirname($dest_file))) {
+                $this->_createDestDirs($dest_file);
+                if (!is_dir(dirname($dest_file)) || !is_writable(dirname($dest_file))) {
+                    $app->logMsg(sprintf('Image resizing failed, dest_dir invalid: %s', dirname($dest_file)), LOG_ERR, __FILE__, __LINE__);
+                    $return_val++;
+                    continue;
+                }
+            }
 
             // Skip existing thumbnails with file size below $spec['keep_filesize'].
@@ -343 +376 @@
             if ($image_size['0'] <= $spec['width'] && $image_size['1'] <= $spec['height'] && !$spec['allow_upscaling']) {
                 $spec['scaling_type'] = IMAGETHUMB_NO_SCALE;
-                $app->logMsg(sprintf('Image %s smaller than specified %s thumbnail size. Keeping original size.', $file_name, $spec['dest_dir']), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Image %s smaller than specified %s thumbnail size. Keeping original size.', $file_name, basename($spec['dest_dir'])), LOG_DEBUG, __FILE__, __LINE__);
             }
 
@@ -349 +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...', null), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Resizing with Netpbm: %s', $file_name), 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...', null), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Resizing with GD: %s', $file_name), LOG_DEBUG, __FILE__, __LINE__);
                 $return_val += $this->_resizeWithGD($source_file, $dest_file, $spec);
             } else {
-                $app->logMsg(sprintf('Image thumbnailing failed. Neither Netpbm or GD is available.', null), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Image thumbnailing canceled. Neither Netpbm or GD is available.', null), LOG_ERR, __FILE__, __LINE__);
                 return false;
             }
         }
 
-        // If > 0, there was a problem thumb-nailing.
+        // If > 0, there was a problem thumbnailing.
         return 0 === $return_val;
     }
@@ -516 +549 @@
         if (!imagecopyresampled($dest_image_resource, $source_image_resource, 0, 0, 0, 0, $dest_image_width, $dest_image_height, $source_image_width, $source_image_height)) {
             $app->logMsg(sprintf('Error resampling image %s', $source_file), LOG_WARNING, __FILE__, __LINE__);
+            // Always cleanup images from memory.
+            imagedestroy($source_image_resource);
+            imagedestroy($dest_image_resource);
             return 1;
         }
@@ -543 +579 @@
         default :
             $app->logMsg(sprintf('Destination image type %s not supported for image %s.', $spec['dest_file_type'], $dest_file), LOG_WARNING, __FILE__, __LINE__);
+            // Always cleanup images from memory.
+            imagedestroy($source_image_resource);
+            imagedestroy($dest_image_resource);
             return 1;
             break;
         }
+
+        // Always cleanup images from memory.
+        imagedestroy($source_image_resource);
+        imagedestroy($dest_image_resource);
 
         if ($return_val) {
             // Success!
             // Make the thumbnail writable so the user can delete it over ftp without being 'apache'.
-            chmod($dest_file, $this->getParam('dest_file_perms'));
-            $app->logMsg(sprintf('Successfully resized image %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
+            if (!chmod($dest_file, $this->getParam('dest_file_perms'))) {
+                $app->logMsg(sprintf('chmod failed on file: %s', $dest_file), LOG_ERR, __FILE__, __LINE__);
+            }
+            $app->logMsg(sprintf('Successfully resized image: %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
             return 0;
         } else {
             // An error occurred.
-            $app->logMsg(sprintf('Image %s failed resizing.', $dest_file), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Failed resizing image: %s', $dest_file), LOG_ERR, __FILE__, __LINE__);
             return 1;
         }
@@ -578 +623 @@
 
         $return_val = 0;
-        foreach ($this->image_specs as $spec) {
-            $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extention']));
+        foreach ($this->_image_specs as $spec) {
+            if ('/' == $spec['dest_dir']{0}) {
+                // Absolute path.
+                $dest_file = realpath(sprintf('%s/%s.%s', $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extention']));                
+            } else {
+                // Relative path.
+                $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], substr($file_name, 0, strrpos($file_name, '.')), $spec['dest_file_extention']));
+            }
             if (file_exists($dest_file)) {
                 if (!unlink($dest_file)) {
@@ -657 +708 @@
      * @return  bool true on success, false on failure.
      */
-    function _createDestDirs()
-    {
-        $app =& App::getInstance();
-
-        static $already_checked = false;
-
-        if (!$already_checked) {
+    function _createDestDirs($filename=null)
+    {
+        $app =& App::getInstance();
+
+        // Keep track of directories we've already created.
+        $dd_hash = md5(isset($filename) ? dirname($filename) : 'none');
+        static $already_checked = array();
+
+        $return_val = 0;
+
+        if (!isset($already_checked[$dd_hash])) {
             // Ensure we have a source.
             if ('' == $this->getParam('source_dir')) {
@@ -671 +726 @@
         
             // Loop through specs and ensure all dirs are created.
-            $return_val = 0;
-            foreach ($this->image_specs as $spec) {
-                if (!file_exists($this->getParam('source_dir') . '/' . $spec['dest_dir'])) {
-                    if (!mkdir($this->getParam('source_dir') . '/' . $spec['dest_dir'], $this->getParam('dest_dir_perms'))) {
-                        $return_val++;
-                        $app->logMsg(sprintf('mkdir failure: %s', $this->getParam('source_dir') . '/' . $spec['dest_dir']), LOG_ERR, __FILE__, __LINE__);
+            foreach ($this->_image_specs as $spec) {
+                if (isset($filename)) {
+                    $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']);
                     }
                 }
-            }
-
-            // If > 0, there was a problem creating dest dirs.
-            return 0 === $return_val;
-        }
-
-        $already_checked = true;
+                if (!file_exists($dest_dir)) {
+                    if (phpversion() > '5' && false) { ///
+                        // Recursive.
+                        if (! ($ret = mkdir($dest_dir, $this->getParam('dest_dir_perms'), true))) {
+                            $return_val++;
+                            $app->logMsg(sprintf('mkdir failure: %s', $dest_dir), LOG_ERR, __FILE__, __LINE__);
+                        }
+                    } else {
+                        // Recursive mkdir for php 4.
+                        $path = '';
+                        foreach (array_diff(explode('/', $dest_dir), array('')) as $dir) {
+                            $path .= '/' . $dir;
+                            if (! ($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;
+                            }
+                        }
+                    }
+
+                    if ($ret) {
+                        $app->logMsg(sprintf('mkdir success: %s', $dest_dir), LOG_DEBUG, __FILE__, __LINE__);                        
+                    }
+                }
+            }
+        }
+
+        $already_checked[$dd_hash] = true;
+
+        // If > 0, there was a problem creating dest dirs.
+        return 0 === $return_val;
     }
 

trunk/lib/PageNumbers.inc.php

@@ -72 +72 @@
     function setPerPage($per_page, $default=25, $save_value=true)
     {
-        $prefs =& Prefs::getInstance();
+        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
+        $prefs->setParam(array('persistent' => false));
     
         // (1) By provided argument, if valid.
@@ -81 +82 @@
             $this->_per_page = $per_page;
             if ($save_value) {
-                $prefs->set('items_per_page', $this->_per_page, $_SERVER['PHP_SELF']);
-            }
-        } else if ($save_value && $prefs->exists('items_per_page', $_SERVER['PHP_SELF'])) {
-            $this->_per_page = (int)$prefs->get('items_per_page', $_SERVER['PHP_SELF']);
+                $prefs->set('items_per_page', $this->_per_page);
+            }
+        } else if ($save_value && $prefs->exists('items_per_page')) {
+            $this->_per_page = (int)$prefs->get('items_per_page');
         } else if (is_numeric($default) && $default > 0) {
             $this->_per_page = $default;
@@ -96 +97 @@
     function setPageNumber($page_number, $save_value=true)
     {
-        $prefs =& Prefs::getInstance();
+        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
+        $prefs->setParam(array('persistent' => false));
     
-    // (1) By provided argument, if valid.
+        // (1) By provided argument, if valid.
         // (2) By saved preference, if available.
         // (3) Don't change from what was provided at class instantiation.
@@ -109 +111 @@
             }
             if ($save_value) {
-                $prefs->set('page_number', $this->current_page, $_SERVER['PHP_SELF']);
-            }
-        } else if ($save_value && $prefs->exists('page_number', $_SERVER['PHP_SELF'])) {
-            $this->current_page = (int)$prefs->get('page_number', $_SERVER['PHP_SELF']);
+                $prefs->set('page_number', $this->current_page);
+            }
+        } else if ($save_value && $prefs->exists('page_number')) {
+            $this->current_page = (int)$prefs->get('page_number');
         }
         $this->set_page_number_initialized = true;

trunk/lib/Prefs.inc.php

@@ -14 +14 @@
 // Load preferences for the user's session.
 require_once 'codebase/lib/Prefs.inc.php';
-$prefs = new Prefs('bURB');
+$prefs =& Prefs::getInstance('my-namespace');
 $prefs->setParam(array(
-    'enable_db' => $auth->isLoggedIn(),
+    'persistent' => $auth->isLoggedIn(),
     'user_id' => $auth->get('user_id'),
 ));
@@ -37 +37 @@
     var $_ns;
 
-    // Configuration of this object.
+    // Configuration parameters for this object.
     var $_params = array(
         
-        // The current user_id for which to load/save preferences.
+        // Enable database storage. If this is false, all prefs will live only as long as the session.
+        'persistent' => false,
+        
+        // The current user_id for which to load/save persistent preferences.
         'user_id' => null,
         
-        // How long before we force a reload of the prefs data? 3600 = once every hour.
+        // How long before we force a reload of the persistent prefs data? 3600 = once every hour.
         'load_timeout' => 3600,
         
-        // Enable database storage.
-        'enable_db' => true,
-        
-        // Name of database table to store prefs.
+        // Name of database table to store persistent prefs.
         'db_table' => 'pref_tbl',
 
@@ -74 +74 @@
             $this->setParam(array('create_table' => $app->getParam('db_create_tables')));
         }
+    }
+
+    /**
+     * This method enforces the singleton pattern for this class.
+     *
+     * @return  object  Reference to the global Prefs object.
+     * @access  public
+     * @static
+     */
+    function &getInstance($namespace='')
+    {
+        static $instances = array();
+
+        if (!array_key_exists($namespace, $instances)) {
+            $instances[$namespace] = new Prefs($namespace);
+        }
+
+        return $instances[$namespace];
     }
 
@@ -167 +185 @@
      * This function determins what data is saved to the database. Ensure clean values!
      *
-     * @param  string $key       The name of the preference to modify.
-     * @param  string $val       The new value for this preference.
+     * @param  string $key          The name of the preference to modify.
+     * @param  string $val          The new value for this preference.
+     * @param  bool   $persistent   Save this value forever? Set to false and value will exist as long as the session is in use.
      */
     function set($key, $val)
     {
         $app =& App::getInstance();
+
         if ('' == $key) {
             $app->logMsg(sprintf('Key is empty (provided with value: %s)', $val), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
+        
         if (!isset($_SESSION[$this->_ns]['defaults'][$key]) || $_SESSION[$this->_ns]['defaults'][$key] != $val || isset($_SESSION[$this->_ns]['persistent'][$key])) {
             $_SESSION[$this->_ns]['persistent'][$key] = $val;            
@@ -193 +214 @@
     {
         $app =& App::getInstance();
-        if (isset($_SESSION[$this->_ns]['persistent'][$key])) {
+        if (array_key_exists($key, $_SESSION[$this->_ns]['persistent'])) {
             return $_SESSION[$this->_ns]['persistent'][$key];
-        } else if (isset($_SESSION[$this->_ns]['defaults'][$key])) {
+        } else if (array_key_exists($key, $_SESSION[$this->_ns]['defaults'])) {
             return $_SESSION[$this->_ns]['defaults'][$key];
         } else {
-            $app->logMsg(sprintf('Key not defined in default or persistent prefs cache: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
             return null;
         }
@@ -204 +225 @@
 
     /**
-     * To see if a persistent preference has been set.
+     * To see if a preference has been set.
      *
      * @param string $key       The name of the preference to check.
@@ -211 +232 @@
     function exists($key)
     {
-        return isset($_SESSION[$this->_ns]['persistent'][$key]);
+        return array_key_exists($key, $_SESSION[$this->_ns]['persistent']);
     }
 
@@ -254 +275 @@
         
         // Skip this method if not using the db.
-        if (true !== $this->getParam('enable_db')) {
+        if (true !== $this->getParam('persistent')) {
             return true;
         }
@@ -332 +353 @@
         
         // Skip this method if not using the db.
-        if (true !== $this->getParam('enable_db')) {
+        if (true !== $this->getParam('persistent')) {
             return true;
         }

trunk/lib/SortOrder.inc.php

@@ -69 +69 @@
     function setDefault($default_sort = '', $default_order = '')
     {
-        $prefs =& Prefs::getInstance();
+        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
+        $prefs->setParam(array('persistent' => false));
 
         // Which column to sort by?
@@ -78 +79 @@
         if (!empty($new_sort_by)) {
             $this->sort_by = $new_sort_by;
-            $prefs->set('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
-        } else if ($prefs->exists('sort_by', $_SERVER['PHP_SELF'])) {
-            $this->sort_by = $prefs->get('sort_by', $_SERVER['PHP_SELF']);
+            $prefs->set('sort_by', $this->sort_by);
+        } else if ($prefs->exists('sort_by')) {
+            $this->sort_by = $prefs->get('sort_by');
         } else {
             $this->sort_by = $default_sort;
@@ -92 +93 @@
         if (!empty($new_order)) {
             $this->order = $new_order;
-            $prefs->set('sort_order', $this->order, $_SERVER['PHP_SELF']);
-        } else if ($prefs->exists('sort_order', $_SERVER['PHP_SELF'])) {
-            $this->order = $prefs->get('sort_order', $_SERVER['PHP_SELF']);
+            $prefs->set('sort_order', $this->order);
+        } else if ($prefs->exists('sort_order')) {
+            $this->order = $prefs->get('sort_order');
         } else {
             $this->order = $default_order;
@@ -111 +112 @@
     function set($sort = null, $order = null)
     {
-        $prefs =& Prefs::getInstance();
+        $prefs =& Prefs::getInstance($_SERVER['PHP_SELF']);
+        $prefs->setParam(array('persistent' => false));
 
         // Set new sort value.
         if (isset($sort)) {
             $this->sort_by = $sort;
-            $prefs->set('sort_by', $this->sort_by, $_SERVER['PHP_SELF']);
+            $prefs->set('sort_by', $this->sort_by);
         }
 
@@ -122 +124 @@
         if (isset($order)) {
             $this->order = $order;
-            $prefs->set('sort_order', $this->order, $_SERVER['PHP_SELF']);
+            $prefs->set('sort_order', $this->order);
         }
     }

trunk/lib/Upload.inc.php

@@ -63 +63 @@
             if (isset($params['upload_path'])) {
                 $params['upload_path'] = realpath($params['upload_path']);
-                // Must be directory.
+                // Source must be directory.
                 if (!is_dir($params['upload_path'])) {
                     $app->logMsg(sprintf('Attempting to auto-create upload directory: %s', $params['upload_path']), LOG_NOTICE, __FILE__, __LINE__);
-                    mkdir($params['upload_path'], $this->getParam('dest_dir_perms'));
+                    if (phpversion() > '5') {
+                        // Recursive.
+                        mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'), true);
+                    } else {
+                        mkdir($params['upload_path'], isset($params['dest_dir_perms']) ? $params['dest_dir_perms'] : $this->getParam('dest_dir_perms'));
+                    }
                     if (!is_dir($params['upload_path'])) {
                         $app->logMsg(sprintf('Upload directory invalid: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);
@@ -72 +77 @@
                     }
                 }
-                // Must be writable.
+                // Source must be writable.
                 if (!is_writable($params['upload_path'])) {
                     $app->logMsg(sprintf('Upload directory not writable: %s', $params['upload_path']), LOG_ERR, __FILE__, __LINE__);

trunk/services/admins.php

@@ -30 +30 @@
 $fv = new FormValidator();
 
-$cache =& Cache::getInstance();
+// Configure the prefs object.
+$prefs =& Prefs::getInstance('admins');
+$prefs->setParam(array('persistent' => false));
+
+// Configure the cache object.
+$cache =& Cache::getInstance('admins');
+$cache->setParam(array('enable' => true));
 
 // Instantiate a sorting object with the default sort and order. Add SQL for each column.
@@ -70 +76 @@
 
 if (getFormData('break_list_cache', false)) {
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 }
 
@@ -319 +325 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('admins');
     
     $lock->select('admin_tbl', 'admin_id', $id);
@@ -326 +332 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // Get the information for this object.
@@ -367 +373 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('admins');
     
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // Insert record data.
@@ -411 +417 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance();
+    $cache =& Cache::getInstance('admins');
     
     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
@@ -418 +424 @@
     }
 
-    // Break the cache because we are changing the list data.
-    $cache->delete($_SERVER['PHP_SELF']);
+    // Remove any stale cached list data.
+    $cache->delete('list');
 
     // If the userpass is left blank or with the filler **** characters, we don't want to update it.
@@ -455 +461 @@
     global $so;
     $db =& DB::getInstance();
-    $prefs =& Prefs::getInstance();
-    $cache =& Cache::getInstance();
+    $prefs =& Prefs::getInstance('admins');
+    $cache =& Cache::getInstance('admins');
     
     $where_clause = '';
@@ -501 +507 @@
     ";
 
+    // Use a cash hash to determine if the result-set has changed.
     // A unique key for this query, with the total_items in case db records
     // were added since the last cache. This identifies a unique set of
@@ -507 +514 @@
     // without knowing the hash.
     $cache_hash = md5($sql . '|' . $page->total_items);
-    if ($prefs->get('cache_hash', $_SERVER['PHP_SELF']) != $cache_hash) {
-        $cache->delete($_SERVER['PHP_SELF']);
-        $prefs->set('cache_hash', $cache_hash, $_SERVER['PHP_SELF']);
-    }
-
-    if ($cache->exists($_SERVER['PHP_SELF']) && false) {
-        // Get the cached results.
-        $list = $cache->get($_SERVER['PHP_SELF']);
-    } else {
-        // If the list is not already cached, query now.
-        $qid = $db->query($sql);
-        // Fill an array with the items for this page.
-        while ($row = mysql_fetch_assoc($qid)) {
-            $list[] = $row;
-        }
-
-        if (isset($list) && !empty($list)) {
-            // Cache the results.
-            $cache->set($list, $_SERVER['PHP_SELF']);
-        }
+    if ($prefs->get('cache_hash') != $cache_hash) {
+        $cache->delete('list');
+        $prefs->set('cache_hash', $cache_hash);
+    }
+
+    // First try to return from the cache.
+    if ($cache->exists('list')) {
+        return $cache->get('list');
+    }
+    
+    // The list was not cached, so issue the real query.
+    $qid = $db->query($sql);
+    while ($row = mysql_fetch_assoc($qid)) {
+        $list[] = $row;
+    }
+
+    // Save this list into the cache.
+    if (isset($list) && !empty($list)) {
+        $cache->set('list', $list);
     }
 

trunk/services/logs.php

@@ -39 +39 @@
 
 // Set the defaults and catch incoming settings.
-$prefs =& Prefs::getInstance();
-$prefs->setDefault('log_file', $app->getParam('log_filename'), 'logs_module');
-$prefs->set('log_file', getFormData('log'), 'logs_module');
+$prefs =& Prefs::getInstance('admin_logs');
+$prefs->setDefaults(array(
+    'log_file' => $app->getParam('log_filename')
+));
+$prefs->set('log_file', getFormData('log'));
 
 // Titles and navigation header.
-$nav->addPage(sprintf(_("Viewing log: <em>%s</em>"), $prefs->get('log_file', 'logs_module')), '/admin/logs.php');
+$nav->addPage(sprintf(_("Viewing log: <em>%s</em>"), $prefs->get('log_file')), '/admin/logs.php');
 
 /********************************************************************
@@ -57 +59 @@
 case 'delete' :
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
-    deleteLog($prefs->get('log_file', 'logs_module'));
-    $prefs->set('log_file', $app->getParam('log_filename'), 'logs_module');
+    deleteLog($prefs->get('log_file'));
+    $prefs->set('log_file', $app->getParam('log_filename'));
     if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
@@ -69 +71 @@
 case 'clear' :
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
-    clearLog($prefs->get('log_file', 'logs_module'));
+    clearLog($prefs->get('log_file'));
     if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
@@ -80 +82 @@
 case 'archive' :
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
-    if (archiveLog($prefs->get('log_file', 'logs_module'))) {
+    if (archiveLog($prefs->get('log_file'))) {
         // Now flush current log.
         $app->dieURL($_SERVER['PHP_SELF'] . '?op=clear');
@@ -98 +100 @@
 case 'download' :
     header('Content-Type: application/octet-stream');
-    header(sprintf('Content-Disposition: attachment; filename=%s.txt', $prefs->get('log_file', 'logs_module')));
-    printLog($prefs->get('log_file', 'logs_module'));
+    header(sprintf('Content-Disposition: attachment; filename=%s.txt', $prefs->get('log_file')));
+    printLog($prefs->get('log_file'));
     die;
     break;
 
 default :
-    $list =& getLog($prefs->get('log_file', 'logs_module'), getFormData('search_query'));
+    $list =& getLog($prefs->get('log_file'), getFormData('search_query'));
     $main_template = 'log_list.ihtml';
     break;
@@ -126 +128 @@
 include 'header.ihtml';
 if ('output' == $main_template) {
-    printLog($prefs->get('log_file', 'logs_module'));
+    printLog($prefs->get('log_file'));
 } else {
     include 'codebase/services/templates/' . $main_template;

trunk/services/templates/log_list.ihtml

@@ -10 +10 @@
         <tr class="commandtext">
             <td>
-                <?php if ($l['filename'] == $prefs->get('log_file', 'logs_module')) { ?>
+                <?php if ($l['filename'] == $prefs->get('log_file')) { ?>
                     <span class="commanditem"><strong><?php echo sprintf(_("%s"), $l['filename']); ?></strong></span>
                 <?php } else { ?>