Changeset 136 for trunk/lib/TemplateGlue.inc.php

Timestamp:

Jun 3, 2006 7:47:48 PM (18 years ago)

Author:

scdev

Message:

Q - Merged branches/2.0singleton into trunk. Completed updating classes to use singleton methods. Implemented tests. Fixed some bugs. Changed some interfaces.

File:

• trunk/lib/TemplateGlue.inc.php (modified) (6 diffs)

trunk/lib/TemplateGlue.inc.php

@@ -66 +66 @@
 function getSetEnumFieldValues($db_table, $db_col)
 {
-    $qid = DB::query("SHOW COLUMNS FROM " . DB::escapeString($db_table) . " LIKE '" . DB::escapeString($db_col) . "'",false);
+    $app =& App::getInstance();
+    $db =& DB::getInstance();
+    
+    $qid = $db->query("SHOW COLUMNS FROM " . $db->escapeString($db_table) . " LIKE '" . $db->escapeString($db_col) . "'",false);
 
     $row = mysql_fetch_row($qid);
@@ -72 +75 @@
         return $enum[1];
     } else {
-        App::logMsg(sprintf('No set or enum fields found.', null), LOG_ERR, __FILE__, __LINE__);
+        $app->logMsg(sprintf('No set or enum fields found.', null), LOG_ERR, __FILE__, __LINE__);
         return false;
     }
@@ -294 +297 @@
 function printSelectForm($db_table, $key_column, $val_column, $preselected, $blank=false, $extra_clause='')
 {
+    $db =& DB::getInstance();
+    
     // Sometimes preselected comes as a comma list.
     if (!is_array($preselected)) {
@@ -314 +319 @@
         }
     }
-    $qid = DB::query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    $qid = $db->query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
     while ($row = mysql_fetch_assoc($qid)) {
         $selected = in_array($row[$val_column], $preselected) ? ' selected="selected"' : '';
@@ -335 +340 @@
 function printDBCheckboxes($db_table, $key_column, $val_column, $preselected, $columns=1, $extra_clause='', $vert_columns=false)
 {
+    $db =& DB::getInstance();
+    
     // Sometimes preselected comes as a comma list.
     if (!is_array($preselected)) {
@@ -348 +355 @@
     }
 
-    $qid = DB::query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
+    $qid = $db->query("SELECT $key_column, $val_column FROM $db_table $extra_clause",false);
     while ($row = mysql_fetch_assoc($qid)) {
         $values[] = $row;