aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_privmsgs.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-08-06 05:52:41 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-08-06 05:52:41 +0000
commit2f901a520326b4d6941ef18fcfce0a9d5ef9cea5 (patch)
tree7ef08c7f0bedfed5f6a65278c8dc53194ac16d20 /phpBB/includes/functions_privmsgs.php
parentb4b901b82552e639cae00c4dc38542cf6fe2d873 (diff)
downloadforums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar
forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar.gz
forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar.bz2
forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar.xz
forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.zip
This should end some issues we have been having regarding the proper binary encoding of stuff. :D
Acyd Burn: quit breaking the schema :P git-svn-id: file:///svn/phpbb/trunk@6238 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
-rw-r--r--phpBB/includes/functions_privmsgs.php132
1 files changed, 2 insertions, 130 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index b41a2f8b8f..068925b359 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1316,141 +1316,13 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
if ($mode == 'post' || $mode == 'reply' || $mode == 'quote' || $mode == 'quotepost' || $mode == 'forward')
{
- switch (SQL_LAYER)
- {
- case 'mssql':
- case 'mssql_odbc':
- $fields = array();
- foreach ($sql_data as $key => $var)
- {
- $fields[] = $key;
-
- if (is_null($var))
- {
- $values[] = 'NULL';
- }
- else if (is_string($var))
- {
- if ($key !== 'bbcode_bitfield')
- {
- $values[] = "'" . $db->sql_escape($var) . "'";
- }
- else
- {
- $values[] = "CAST('" . $var . "' AS varbinary)";
- }
- }
- else
- {
- $values[] = (is_bool($var)) ? intval($var) : $var;
- }
- }
- $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
- break;
-
- case 'sqlite':
- $fields = array();
- foreach ($sql_data as $key => $var)
- {
- $fields[] = $key;
-
- if (is_null($var))
- {
- $values[] = 'NULL';
- }
- else if (is_string($var))
- {
- if ($key !== 'bbcode_bitfield')
- {
- $values[] = "'" . $db->sql_escape($var) . "'";
- }
- else
- {
- $values[] = "'" . sqlite_udf_encode_binary($var) . "'";
- }
- }
- else
- {
- $values[] = (is_bool($var)) ? intval($var) : $var;
- }
- }
- $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
- break;
-
- default:
- $query = $db->sql_build_array('INSERT', $sql_data);
- break;
- }
-
- $db->sql_query('INSERT INTO ' . PRIVMSGS_TABLE . ' ' . $query);
+ $db->sql_query('INSERT INTO ' . PRIVMSGS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_data));
$data['msg_id'] = $db->sql_nextid();
}
else if ($mode == 'edit')
{
- switch (SQL_LAYER)
- {
- case 'mssql':
- case 'mssql_odbc':
- $values = array();
- foreach ($sql_data as $key => $var)
- {
- if (is_null($var))
- {
- $values[] = "$key = NULL";
- }
- else if (is_string($var))
- {
- if ($key !== 'forum_desc_bitfield')
- {
- $values[] = "$key = '" . $db->sql_escape($var) . "'";
- }
- else
- {
- $values[] = "$key = CAST('" . $var . "' AS varbinary)";
- }
- }
- else
- {
- $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
- }
- }
- $query = implode(', ', $values);
- break;
-
- case 'sqlite':
- $values = array();
- foreach ($sql_data as $key => $var)
- {
- if (is_null($var))
- {
- $values[] = "$key = NULL";
- }
- else if (is_string($var))
- {
- if ($key !== 'forum_desc_bitfield')
- {
- $values[] = "$key = '" . $db->sql_escape($var) . "'";
- }
- else
- {
- $values[] = "$key = '" . sqlite_udf_encode_binary($var) . "'";
- }
- }
- else
- {
- $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
- }
- }
- $query = implode(', ', $values);
- break;
-
- default:
- $query = $db->sql_build_array('UPDATE', $sql_data);
- break;
- }
-
$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
- SET message_edit_count = message_edit_count + 1, ' . $query . '
+ SET message_edit_count = message_edit_count + 1, ' . $db->sql_build_array('UPDATE', $sql_data) . '
WHERE msg_id = ' . $data['msg_id'];
$db->sql_query($sql);
}