Some more fudges

git-svn-id: file:///svn/phpbb/trunk@3689 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-03-20 02:23:12 +00:00
parent 115a2cc9e0
commit 53449e4b9f

View file

@ -1,6 +1,6 @@
<?php <?php
/*************************************************************************** /***************************************************************************
* mysql.php * firebird.php
* ------------------- * -------------------
* begin : Saturday, Feb 13, 2001 * begin : Saturday, Feb 13, 2001
* copyright :(C) 2001 The phpBB Group * copyright :(C) 2001 The phpBB Group
@ -32,8 +32,6 @@ class sql_db
var $transaction = false; var $transaction = false;
var $sql_report = ''; var $sql_report = '';
var $sql_time = 0; var $sql_time = 0;
var $escape_max = array('match' => array("\0", '\\', '\'', '"'), 'replace' => array('\\0', '\\\\', '\'\'', '\"'));
var $escape_min = array('match' => array("\0", '\\', '"'), 'replace' => array('\\0', '\\\\', '\"'));
// Constructor // Constructor
function sql_db($sqlserver, $sqluser, $sqlpassword, $database = '', $port = '', $persistency = false) function sql_db($sqlserver, $sqluser, $sqlpassword, $database = '', $port = '', $persistency = false)
@ -149,7 +147,7 @@ class sql_db
else else
{ {
$error = $this->sql_error(); $error = $this->sql_error();
$this->sql_report .= '<b>FAILED</b> - MySQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']) . '<br><br><pre>'; $this->sql_report .= '<b>FAILED</b> - SQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']) . '<br><br><pre>';
} }
$this->sql_time += $endtime - $curtime; $this->sql_time += $endtime - $curtime;
@ -418,7 +416,7 @@ class sql_db
function sql_escape($msg) function sql_escape($msg)
{ {
return (@ini_get('magic_quotes_sybase') || strtoupper(@ini_get('magic_quotes_sybase')) == 'ON') ? str_replace($this->replace_min['match'], $this->replace_min['replace'], stripslashes($msg)) : str_replace($this->replace_max['match'], $this->replace_max['replace'], stripslashes($msg)); return (@ini_get('magic_quotes_sybase') || strtoupper(@ini_get('magic_quotes_sybase')) == 'ON') ? str_replace('\\\'', '\'', addslashes($msg)) : str_replace('\\\'', '\'\'', $msg);
} }
function sql_error($sql = '') function sql_error($sql = '')