Changeset 111 for trunk/bin/module_maker/sql.cli.php

Timestamp:

Apr 27, 2006 1:49:54 AM (18 years ago)

Author:

scdev

Message:

Q - Finished depreciating addslashes. array_map instances need to use array('DB', 'escapeString') as first argument.

File:

• trunk/bin/module_maker/sql.cli.php (modified) (8 diffs)

trunk/bin/module_maker/sql.cli.php

@@ -46 +46 @@
 
 // Get DB table column info.
-$qid = DB::query("DESCRIBE " . addslashes($db_tbl));
+$qid = DB::query("DESCRIBE " . DB::escapeString($db_tbl));
 while ($row = mysql_fetch_row($qid)) {
     $cols[] = $row;
@@ -70 +70 @@
         } else if ('set' == $type) {
             // Set types usually need to be converted to comma-delimited lists.
-            $c[$field] = "'\" . dbArrayToList(\$frm['$field']) . \"'";
+            $c[$field] = "'\" . escapedList(array_keys(\$frm['$field'])) . \"'";
         } else if ('featured' == $field || 'publish' == $field || preg_match("/enum\('true'\)/", $col[1])) {
             // Toggle types.
@@ -76 +76 @@
         } else if ('added_by_user_id' == $field || 'modified_by_user_id' == $field) {
             // Toggle types.
-            $c[$field] = "'\" . addslashes(\$auth->getVal('user_id')) . \"'";
+            $c[$field] = "'\" . DB::escapeString(\$auth->getVal('user_id')) . \"'";
         } else if ('added_datetime' == $field || 'modified_datetime' == $field) {
             // DB record insertion datetime.
@@ -82 +82 @@
         } else {
             // Default. Just insert data.
-            $c[$field] = "'\" . addslashes(\$frm['$field']) . \"'";
+            $c[$field] = "'\" . DB::escapeString(\$frm['$field']) . \"'";
         }
     }
@@ -135 +135 @@
     DB::query("
         UPDATE $db_tbl SET$key_eq_val
-        WHERE $primary_key = '" . addslashes(\$frm['$primary_key']) . "'
+        WHERE $primary_key = '" . DB::escapeString(\$frm['$primary_key']) . "'
     ");
 E_O_F;
@@ -148 +148 @@
 $delim = 'WHERE';
 if (!empty($primary_key)) {
-    $where_clause = "            $delim $primary_key = '\" . addslashes(\$frm['$primary_key']) . \"'\n";
+    $where_clause = "            $delim $primary_key = '\" . DB::escapeString(\$frm['$primary_key']) . \"'\n";
     $delim = 'AND';
 }
@@ -155 +155 @@
         continue;
     }
-    $where_clause .= "            $delim $k = '\" . addslashes(\$frm['$k']) . \"'\n";
+    $where_clause .= "            $delim $k = '\" . DB::escapeString(\$frm['$k']) . \"'\n";
     $delim = 'AND';
 }
@@ -183 +183 @@
 if (!isset($op) || 'search' == $op) {
 $search_skip_columns = array('added_datetime', 'added_by_user_id', 'modified_datetime', 'modified_by_user_id', 'publish', 'featured');
-$search_columns = $db_tbl . '.' . join(" LIKE '%\" . addslashes(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
+$search_columns = $db_tbl . '.' . join(" LIKE '%\" . DB::escapeString(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
 echo <<<E_O_F
             \$where_clause .= (empty(\$where_clause) ? 'WHERE' : 'AND') . "
                 (
-                    $search_columns LIKE '%" . addslashes(\$qry_words[\$i]) . "%'
+                    $search_columns LIKE '%" . DB::escapeString(\$qry_words[\$i]) . "%'
                 )
             ";