Changeset 153 for trunk/bin

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.

File:

• trunk/bin/module_maker/skel/admin.php (modified) (7 diffs)

trunk/bin/module_maker/skel/admin.php

@@ -34 +34 @@
 
 // Configure the prefs object.
-$prefs =& Prefs::getInstance('%NAME_PLURAL%');
-$prefs->setParam(array('persistent' => false));
+$tmp_prefs = new Prefs('%NAME_PLURAL%');
+$tmp_prefs->setParam(array('persistent' => false));
 
 // Configure the cache object.
-$cache =& Cache::getInstance('%NAME_PLURAL%');
+$cache = new Cache('%NAME_PLURAL%');
 $cache->setParam(array('enable' => true));
 
@@ -255 +255 @@
 {
     global $lock;
+    global $cache;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
@@ -290 +290 @@
 {
     global $auth;
+    global $cache;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     // Remove any stale cached list data.
@@ -311 +311 @@
 {
     global $auth, $lock;
+    global $cache;
     $app =& App::getInstance();
-    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
@@ -338 +338 @@
     global $page;
     global $so;
+    global $tmp_prefs;
+    global $cache;
     $db =& DB::getInstance();   
-    $prefs =& Prefs::getInstance('%NAME_PLURAL%');
-    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     $where_clause = '';
@@ -390 +390 @@
     // 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);
     }
 
@@ -416 +416 @@
 function updateRank($ranks)
 {
+    global $cache;
     $db =& DB::getInstance();
-    $cache =& Cache::getInstance('%NAME_PLURAL%');
     
     if (!is_array($ranks)) {