r48 - in phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker: . DB docs

Author: s_bergmann
Date: 2005-04-10 11:56:28 +0200 (Sun, 10 Apr 2005)
New Revision: 48

Modified:
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB.php
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql.php
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/pgsql.php
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS
Log:
Factor the string escaping out of prepareString() into a separate method escapeString() that is called by prepareString().

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql.php
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql.php	2005-04-10 07:25:30 UTC (rev 47)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql.php	2005-04-10 09:56:28 UTC (rev 48)
@@ -168,15 +168,14 @@
   }
 
   /**
-  * Prepares a string for an SQL query.
+  * Escapes the string for an SQL query.
   *
   * @param  string $string
   * @return string
   * @access public
+  * @since  1.5.1
   */
-  function prepareString($string) {
-    $string = substr($string, 0, 254);
-
+  function escapeString($string) {
     if (function_exists('mysql_real_escape_string')) {
       return mysql_real_escape_string($string, $this->connection);
     } else {

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/pgsql.php
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/pgsql.php	2005-04-10 07:25:30 UTC (rev 47)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/pgsql.php	2005-04-10 09:56:28 UTC (rev 48)
@@ -98,17 +98,18 @@
   }
 
   /**
-  * Prepares a string for an SQL query.
+  * Escapes the string for an SQL query.
   *
   * @param  string $string
   * @return string
   * @access public
+  * @since  1.5.1
   */
-  function prepareString($string) {
+  function escapeString($string) {
     return str_replace(
       array("'",  '\\'),
       array("''", '\\\\'),
-      substr($string, 0, 254)
+      $string
     );
   }
 }

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB.php
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB.php	2005-04-10 07:25:30 UTC (rev 47)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB.php	2005-04-10 09:56:28 UTC (rev 48)
@@ -204,15 +204,23 @@
   * @access public
   */
   function prepareString($string) {
-    $string = substr($string, 0, 254);
-
     if (ini_get('magic_quotes_gpc')) {
       $string = stripslashes($string);
     }
 
-    $string = str_replace("'", "''", $string);
+    return $this->escapeString(substr($string, 0, 254));
+  }
 
-    return $string;
+  /**
+  * Escapes the string for an SQL query.
+  *
+  * @param  string $string
+  * @return string
+  * @access public
+  * @since  1.5.1
+  */
+  function escapeString($string) {
+    return str_replace("'", "''", $string);
   }
 
   /**

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS	2005-04-10 07:25:30 UTC (rev 47)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS	2005-04-10 09:56:28 UTC (rev 48)
@@ -1,5 +1,7 @@
 (+ Added, * Changed, - Removed, ! Note)
 
+  * Fixed bug #3578.
+
 10-Apr-2005, Version 1.5.0
 
   ! For over a year now I have neither worked on or worked with