Changeset 152 for trunk/services

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/services

Files:

• admins.php (modified) (10 diffs)
• logs.php (modified) (6 diffs)
• templates/log_list.ihtml (modified) (1 diff)

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 { ?>