1 files changed, 3 insertions, 198 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 559be6bcaa..72f240b2e1 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -207,75 +207,7 @@ function user_add($user_row, $cp_data = false)
 		}
 	}
 
-	$query = '';
-
-	switch (SQL_LAYER)
-	{
-		case 'mssql':
-		case 'mssql_odbc':
-			$fields = array();
-			foreach ($sql_ary as $key => $var)
-			{
-				$fields[] = $key;
-
-				if (is_null($var))
-				{
-					$values[] = 'NULL';
-				}
-				else if (is_string($var))
-				{
-					if ($key !== 'user_sig_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_ary as $key => $var)
-			{
-				$fields[] = $key;
-
-				if (is_null($var))
-				{
-					$values[] = 'NULL';
-				}
-				else if (is_string($var))
-				{
-					if ($key !== 'user_sig_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_ary);
-		break;
-	}
-
-	$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $query;
+	$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
 	$db->sql_query($sql);
 
 	$user_id = $db->sql_nextid();
@@ -1495,140 +1427,13 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 
 		if ($group_id)
 		{
-			switch (SQL_LAYER)
-			{
-				case 'mssql':
-				case 'mssql_odbc':
-					$values = array();
-					foreach ($sql_ary as $key => $var)
-					{
-						if (is_null($var))
-						{
-							$values[] = "$key = NULL";
-						}
-						else if (is_string($var))
-						{
-							if ($key !== 'group_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_ary as $key => $var)
-					{
-						if (is_null($var))
-						{
-							$values[] = "$key = NULL";
-						}
-						else if (is_string($var))
-						{
-							if ($key !== 'group_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_ary);
-				break;
-			}
-
 			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET ' . $query . "
+				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
 				WHERE group_id = $group_id";
 		}
 		else
 		{
-			switch (SQL_LAYER)
-			{
-				case 'mssql':
-				case 'mssql_odbc':
-					$fields = array();
-					foreach ($sql_ary 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_ary 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_ary);
-				break;
-			}
-			$sql = 'INSERT INTO ' . GROUPS_TABLE . ' ' . $query;
+			$sql = 'INSERT INTO ' . GROUPS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
 		}
 		$db->sql_query($sql);