Changeset 153 for trunk/services

Timestamp:

Jun 7, 2006 8:41:19 PM (18 years ago)

Author:

scdev

Message:

Q - decided to use standard instantiation for Prefs and Cache instead of singleton methods.

Location:

trunk/services

Files:

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

trunk/services/admins.php

@@ -31 +31 @@
 
 // Configure the prefs object.
-$prefs =& Prefs::getInstance('admins');
-$prefs->setParam(array('persistent' => false));
+$tmp_prefs = new Prefs('admins');
+$tmp_prefs->setParam(array('persistent' => false));
 
 // Configure the cache object.
-$cache =& Cache::getInstance('admins');
+$cache = new Cache('admins');
 $cache->setParam(array('enable' => true));
 
@@ -322 +322 @@
 function deleteRecord($id)
 {
-    global $auth, $lock;
+    global $auth;
+    global $lock;
+    global $cache;
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance('admins');
     
     $lock->select('admin_tbl', 'admin_id', $id);
@@ -371 +372 @@
 {
     global $auth;
+    global $cache;
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance('admins');
     
     // Remove any stale cached list data.
@@ -414 +415 @@
 function updateRecord($frm)
 {
-    global $auth, $lock;
+    global $auth;
+    global $lock;
+    global $cache;
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance('admins');
     
     $lock->select('admin_tbl', 'admin_id', $frm['admin_id']);
@@ -460 +462 @@
     global $page;
     global $so;
+    global $tmp_prefs;
+    global $cache;
     $db =& DB::getInstance();
-    $prefs =& Prefs::getInstance('admins');
-    $cache =& Cache::getInstance('admins');
     
     $where_clause = '';
@@ -514 +516 @@
     // without knowing the hash.
     $cache_hash = md5($sql . '|' . $page->total_items);
-    if ($prefs->get('cache_hash') != $cache_hash) {
+    if ($tmp_prefs->get('cache_hash') != $cache_hash) {
         $cache->delete('list');
-        $prefs->set('cache_hash', $cache_hash);
+        $tmp_prefs->set('cache_hash', $cache_hash);
     }
 

trunk/services/logs.php

@@ -37 +37 @@
 $no_download_files = '/^$/';
 
-
-// Set the defaults and catch incoming settings.
-$prefs =& Prefs::getInstance('admin_logs');
-$prefs->setDefaults(array(
+// Configure the prefs object.
+$tmp_prefs = new Prefs('admin_logs');
+$tmp_prefs->setParam(array('persistent' => false));
+$tmp_prefs->setDefaults(array(
     'log_file' => $app->getParam('log_filename')
 ));
-$prefs->set('log_file', getFormData('log'));
+$tmp_prefs->set('log_file', getFormData('log'));
 
 // Titles and navigation header.
-$nav->addPage(sprintf(_("Viewing log: <em>%s</em>"), $prefs->get('log_file')), '/admin/logs.php');
+$nav->addPage(sprintf(_("Viewing log: <em>%s</em>"), $tmp_prefs->get('log_file')), '/admin/logs.php');
 
 /********************************************************************
@@ -59 +59 @@
 case 'delete' :
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
-    deleteLog($prefs->get('log_file'));
-    $prefs->set('log_file', $app->getParam('log_filename'));
+    deleteLog($tmp_prefs->get('log_file'));
+    $tmp_prefs->set('log_file', $app->getParam('log_filename'));
     if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
@@ -71 +71 @@
 case 'clear' :
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
-    clearLog($prefs->get('log_file'));
+    clearLog($tmp_prefs->get('log_file'));
     if ($app->validBoomerangURL('app_log')) {
         // Display boomerang page.
@@ -82 +82 @@
 case 'archive' :
 //     $auth->requireAccessClearance(ZONE_ADMIN_APPLOG_FUNC_RESET);
-    if (archiveLog($prefs->get('log_file'))) {
+    if (archiveLog($tmp_prefs->get('log_file'))) {
         // Now flush current log.
         $app->dieURL($_SERVER['PHP_SELF'] . '?op=clear');
@@ -100 +100 @@
 case 'download' :
     header('Content-Type: application/octet-stream');
-    header(sprintf('Content-Disposition: attachment; filename=%s.txt', $prefs->get('log_file')));
-    printLog($prefs->get('log_file'));
+    header(sprintf('Content-Disposition: attachment; filename=%s.txt', $tmp_prefs->get('log_file')));
+    printLog($tmp_prefs->get('log_file'));
     die;
     break;
 
 default :
-    $list =& getLog($prefs->get('log_file'), getFormData('search_query'));
+    $list =& getLog($tmp_prefs->get('log_file'), getFormData('search_query'));
     $main_template = 'log_list.ihtml';
     break;
@@ -128 +128 @@
 include 'header.ihtml';
 if ('output' == $main_template) {
-    printLog($prefs->get('log_file'));
+    printLog($tmp_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')) { ?>
+                <?php if ($l['filename'] == $tmp_prefs->get('log_file')) { ?>
                     <span class="commanditem"><strong><?php echo sprintf(_("%s"), $l['filename']); ?></strong></span>
                 <?php } else { ?>