mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

This should end some issues we have been having regarding the proper binary encoding of stuff. :D

Browse Source 
Acyd Burn: quit breaking the schema :P


git-svn-id: file:///svn/phpbb/trunk@6238 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2006-08-06 05:52:41 +00:00
parent b4b901b825
commit 2f901a5203
13 changed files with 250 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/includes/db/dbal.php
View File

@@ -199,7 +199,14 @@ class dbal
}
else if (is_string($var))
{
$values[] = "'" . $this->sql_escape($var) . "'";
if (strpos($key, 'bitfield') === false)
{
$values[] = "'" . $this->sql_escape($var) . "'";
}
else
{
$values[] = $this->sql_escape_binary($var);
}
}
else if (is_array($var) && is_string($var[0]))
{
@@ -228,7 +235,14 @@ class dbal
}
else if (is_string($var))
{
$values[] = "'" . $this->sql_escape($var) . "'";
if (strpos($key, 'bitfield') === false)
{
$values[] = "'" . $this->sql_escape($var) . "'";
}
else
{
$values[] = $this->sql_escape_binary($var);
}
}
else
{
@@ -251,7 +265,14 @@ class dbal
}
else if (is_string($var))
{
$values[] = "$key = '" . $this->sql_escape($var) . "'";
if (strpos($key, 'bitfield') === false)
{
$values[] = "$key = '" . $this->sql_escape($var) . "'";
}
else
{
$values[] = "$key = " . $this->sql_escape_binary($var);
}
}
else
{
@@ -264,6 +285,11 @@ class dbal
return $query;
}
function sql_escape_binary($msg)
{
return "'" . $this->sql_escape($msg) . "'";
}
/**
* Build sql statement from array for select and select distinct statements
*

8
phpBB/includes/db/mssql.php
View File

@@ -369,6 +369,14 @@ class dbal_mssql extends dbal
return str_replace("'", "''", $msg);
}
/**
* Escape string used in sql query
*/
function sql_escape_binary($msg)
{
return "CAST('" . $msg . "' AS varbinary)";
}
/**
* return sql error array
* @access: private

8
phpBB/includes/db/mssql_odbc.php
View File

@@ -379,6 +379,14 @@ class dbal_mssql_odbc extends dbal
return str_replace("'", "''", $msg);
}
/**
* Escape string used in sql query
*/
function sql_escape_binary($msg)
{
return "CAST('" . $msg . "' AS varbinary)";
}
/**
* Build db-specific query data
* @access: private

19
phpBB/includes/db/postgres.php
View File

@@ -258,7 +258,16 @@ class dbal_postgres extends dbal
return $cache->sql_fetchrow($query_id);
}
return ($query_id) ? @pg_fetch_assoc($query_id, NULL) : false;
$row = @pg_fetch_assoc($query_id, null);
if ($row)
{
foreach ($row as $key => $value)
{
$row[$key] = (strpos($key, 'bitfield') === false) ? $value : pg_unescape_bytea($value);
}
}
return ($query_id) ? $row : false;
}
/**
@@ -378,6 +387,14 @@ class dbal_postgres extends dbal
return @pg_escape_string($msg);
}
/**
* Escape string used in sql query
*/
function sql_escape_binary($msg)
{
return "'" . @pg_escape_bytea($msg) . "'";
}
/**
* return sql error array
* @access: private

19
phpBB/includes/db/sqlite.php
View File

@@ -216,7 +216,16 @@ class dbal_sqlite extends dbal
return $cache->sql_fetchrow($query_id);
}
return ($query_id) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false;
$row = @sqlite_fetch_array($query_id, SQLITE_ASSOC);
if ($row)
{
foreach ($row as $key => $value)
{
$row[$key] = (strpos($key, 'bitfield') === false) ? $value : sqlite_udf_decode_binary($value);
}
}
return $row;
}
/**
@@ -307,6 +316,14 @@ class dbal_sqlite extends dbal
return @sqlite_escape_string($msg);
}
/**
* Escape string used in sql query
*/
function sql_escape_binary($msg)
{
return "'" . @sqlite_udf_encode_binary($msg) . "'";
}
/**
* return sql error array
* @access: private