Changeset 111 for trunk/lib/Utilities.inc.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/lib/Utilities.inc.php (modified) (2 diffs)

trunk/lib/Utilities.inc.php

@@ -105 +105 @@
 /**
  * Returns text with stylistic modifications. Warning: this will break some HTML attibutes!
- * FIXME: Allow a string such as this to be passted: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
+ * TODO: Allow a string such as this to be passted: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
  *
  * @param  string   $txt  Text to clean.
@@ -463 +463 @@
 
 /**
- * Adds slashes to values of an array and converts the array to a
- * comma delimited list. If value provided is not an array or is empty
- * return nothing. This is useful for putting values coming in from
- * posted checkboxes into a SET column of a database.
- *
- * @param  array $array   Array to convert.
+ * Adds slashes to values of an array and converts the array to a comma
+ * delimited list. If value provided is a string return the string
+ * escaped.  This is useful for putting values coming in from posted
+ * checkboxes into a SET column of a database.
+ * 
+ *
+ * @param  array $in      Array to convert.
  * @return string         Comma list of array values.
  */
-function dbArrayToList($array)
-{
-    if (is_array($array) && !empty($array)) {
-        return join(',', array_map('addslashes', array_keys($array)));
-    }
-}
-
-/**
- * Converts a human string date into a SQL-safe date.
- * Dates nearing infinity use the date 2038-01-01 so conversion to unix time
- * format remain within valid range.
+function escapedList($in)
+{
+    if (is_array($in) && !empty($in)) {
+        return "'" . join("', '", array_map(array('DB', 'escapeString'), $in)) . "'";
+    } else {
+        return DB::escapeString($in);
+    }
+}
+
+/**
+ * Converts a human string date into a SQL-safe date.  Dates nearing
+ * infinity use the date 2038-01-01 so conversion to unix time format
+ * remain within valid range.
  *
  * @param  array $date     String date to convert.