Changeset 21 for trunk/lib

Timestamp:

Nov 17, 2005 7:37:40 AM (19 years ago)

Author:

scdev

Message:

More random updates. Improved self-instantiation pattern in SessionCache? to match that of App. More little tweaks.

Location:

trunk/lib

Files:

• SessionCache.inc.php (modified) (8 diffs)
• TemplateGlue.inc.php (modified) (2 diffs)

trunk/lib/SessionCache.inc.php

@@ -13 +13 @@
 {
     var $_params = array(
+        'enabled' => true,
         'soft_limit' => 204800,
         'hard_limit' => 4194304,
@@ -43 +44 @@
     function setParam($params)
     {
+        if (!isset($this) || !is_a($this, 'SessionCache')) {
+            $this =& SessionCache::getInstance();
+        }
+
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
@@ -60 +65 @@
     function getParam($param)
     {
+        if (!isset($this) || !is_a($this, 'SessionCache')) {
+            $this =& SessionCache::getInstance();
+        }
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
@@ -86 +95 @@
     function putCache($var, $var_id, $force_it_in=false)
     {
-        $cache =& SessionCache::getInstance();
+        if (!isset($this) || !is_a($this, 'SessionCache')) {
+            $this =& SessionCache::getInstance();
+        }
+
+        if (!$this->getParam('enabled')) {
+            return false;
+        }
 
         $var_id = md5($var_id);
@@ -92 +107 @@
         $serialized_var_len = strlen($serialized_var);
         
-        if ($serialized_var_len >= $cache->getParam('soft_limit') && !$force_it_in) {
-            App::logMsg(sprintf('Serialized variable (%s bytes) more than soft_limit (%s bytes).', $serialized_var_len, $cache->getParam('soft_limit')), LOG_NOTICE, __FILE__, __LINE__);
-            return false;
-        }
-        
-        if ($serialized_var_len >= $cache->getParam('hard_limit')) {
-            App::logMsg(sprintf('Serialized variable (%s bytes) more than hard_limit (%s bytes).', $serialized_var_len, $cache->getParam('hard_limit')), LOG_NOTICE, __FILE__, __LINE__);
+        if ($serialized_var_len >= $this->getParam('soft_limit') && !$force_it_in) {
+            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;
         }
@@ -107 +122 @@
             unset($_SESSION['_session_cache'][$var_id]);
             // 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 >= $cache->getParam('soft_limit') 
-            && sizeof($_SESSION['_session_cache']) >= $cache->getParam('min_items')) {
+            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']);
             }
@@ -133 +148 @@
     function getCache($var_id)
     {
+        if (!isset($this) || !is_a($this, 'SessionCache')) {
+            $this =& SessionCache::getInstance();
+        }
+
+        if (!$this->getParam('enabled')) {
+            return false;
+        }
+        
         $var_id = md5($var_id);
         if (isset($_SESSION['_session_cache'][$var_id])) {
@@ -155 +178 @@
     function isCached($var_id)
     {
+        if (!isset($this) || !is_a($this, 'SessionCache')) {
+            $this =& SessionCache::getInstance();
+        }
+
+        if (!$this->getParam('enabled')) {
+            return false;
+        }
+
         $var_id = md5($var_id);
         return isset($_SESSION['_session_cache'][$var_id]);

trunk/lib/TemplateGlue.inc.php

@@ -72 +72 @@
         return $enum[1];
     } else {
+        App::logMsg(sprintf('No set or enum fields found.', null), LOG_DEBUG, __FILE__, __LINE__);
         return false;
     }
@@ -87 +88 @@
     $values = getSetEnumFieldValues($db_table, $db_col);
     if ($values === false) {
-        ?><option value=""><?php echo _("n/a"); ?></option>
+        ?><option value="">&nbsp;</option>
         <?php
         return false;