Changeset 135 for branches/2.0singleton/services/admins.php

Timestamp:

Jun 1, 2006 7:42:53 AM (18 years ago)

Author:

scdev

Message:

Q - Finished integrating singleton methods into existing code. Renamed SessionCache? to Cache, and renamed methods in Cache and Prefs

File:

• branches/2.0singleton/services/admins.php (modified) (11 diffs)

branches/2.0singleton/services/admins.php

@@ -11 +11 @@
 
 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';
@@ -30 +30 @@
 $fv = new FormValidator();
 
-$cache =& SessionCache::getInstance();
+$cache =& Cache::getInstance();
 
 // Instantiate a sorting object with the default sort and order. Add SQL for each column.
@@ -71 +71 @@
 if (getFormData('break_list_cache', false)) {
     // Break the cache because we are changing the list data.
-    $cache->breakCache($_SERVER['PHP_SELF']);
+    $cache->delete($_SERVER['PHP_SELF']);
 }
 
@@ -319 +319 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     $lock->select('admin_tbl', 'admin_id', $id);
@@ -327 +327 @@
 
     // Break the cache because we are changing the list data.
-    $cache->breakCache($_SERVER['PHP_SELF']);
+    $cache->delete($_SERVER['PHP_SELF']);
 
     // Get the information for this object.
@@ -367 +367 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     // Break the cache because we are changing the list data.
-    $cache->breakCache($_SERVER['PHP_SELF']);
+    $cache->delete($_SERVER['PHP_SELF']);
 
     // Insert record data.
@@ -411 +411 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
@@ -419 +419 @@
 
     // Break the cache because we are changing the list data.
-    $cache->breakCache($_SERVER['PHP_SELF']);
+    $cache->delete($_SERVER['PHP_SELF']);
 
     // If the userpass is left blank or with the filler **** characters, we don't want to update it.
@@ -456 +456 @@
     $db =& DB::getInstance();
     $prefs =& Prefs::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     $where_clause = '';
@@ -507 +507 @@
     // without knowing the hash.
     $cache_hash = md5($sql . '|' . $page->total_items);
-    if ($prefs->getValue('cache_hash', $_SERVER['PHP_SELF']) != $cache_hash) {
-        $cache->breakCache($_SERVER['PHP_SELF']);
-        $prefs->setValue('cache_hash', $cache_hash, $_SERVER['PHP_SELF']);
-    }
-
-    if ($cache->isCached($_SERVER['PHP_SELF']) && false) {
+    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->getCache($_SERVER['PHP_SELF']);
+        $list = $cache->get($_SERVER['PHP_SELF']);
     } else {
         // If the list is not already cached, query now.
@@ -525 +525 @@
         if (isset($list) && !empty($list)) {
             // Cache the results.
-            $cache->putCache($list, $_SERVER['PHP_SELF']);
+            $cache->set($list, $_SERVER['PHP_SELF']);
         }
     }