Changeset 10294

Timestamp:

09/20/10 09:46:45 (3 years ago)

Author:

mbrevda

Message:

re closes #4545 undose re #1963 - remove mysql_real_escape_string function from header.php

Files:

• freepbx/trunk/amp_conf/htdocs/admin/header.php (modified) (1 diff)
• modules/branches/2.9/daynight/page.daynight.php (modified) (1 diff)
• modules/branches/2.9/timeconditions/page.timeconditions.php (modified) (1 diff)

freepbx/trunk/amp_conf/htdocs/admin/header.php

@@ -116 +116 @@
-}
-
-
-
-// systems running on sqlite3 (or pgsql) this function is not available
-// instead of changing the whole code, lets hack our own version of this function.
-// according to the documentation found here: http://il2.php.net/mysql_real_escape_string
-// this shold be enough.
-// Fixes ticket: http://freepbx.org/trac/ticket/1963
-if (!function_exists('mysql_real_escape_string')) {
-  function mysql_real_escape_string($str) {
-    $str = str_replace( "\x00", "\\" . "\x00", $str );
-    $str = str_replace( "\x1a", "\\" . "\x1a", $str );
-    $str = str_replace( "\n" , "\\". "\n"    , $str );
-    $str = str_replace( "\r" , "\\". "\r"    , $str );
-    $str = str_replace( "\\" , "\\". "\\"    , $str );
-    $str = str_replace( "'" , "''"           , $str );
-    $str = str_replace( '"' , '""'           , $str );
-    return $str;
-  }
-}
-?>

modules/branches/2.9/daynight/page.daynight.php

@@ -22 +22 @@
-$night_recording_id = isset($_POST['night_recording_id']) ? $_POST['night_recording_id'] :  '';
-
-mysql_real_escape_string
+$db->escapeSimple
-
-$daynightcodes = daynight_list();

modules/branches/2.9/timeconditions/page.timeconditions.php

@@ -15 +15 @@
-isset($_REQUEST['action'])?$action = $_REQUEST['action']:$action='';
-//the item we are currently displaying
-mysql_real_escape_string
+$db->escapeSimple
-
-$dispnum = "timeconditions"; //used for switch on config.php