diff --git a/phpBB/includes/db/msaccess.php b/phpBB/includes/db/msaccess.php
deleted file mode 100644
index b573a59d27..0000000000
--- a/phpBB/includes/db/msaccess.php
+++ /dev/null
@@ -1,414 +0,0 @@
-persistency = $persistency;
- $this->server = $sqlserver;
- $this->user = $sqluser;
- $this->password = $sqlpassword;
- $this->dbname = $database;
-
- $this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $this->password) : @odbc_connect($this->server, $this->user, $this->password);
-
- return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
- }
-
- function sql_return_on_error($fail = false)
- {
- $this->return_on_error = $fail;
- }
-
- function sql_num_queries()
- {
- return $this->num_queries;
- }
-
- //
- // Other base methods
- //
- function sql_close()
- {
- if($this->db_connect_id)
- {
- if($this->in_transaction)
- {
- @odbc_commit($this->db_connect_id);
- }
-
- if(count($this->result_rowset))
- {
- unset($this->result_rowset);
- unset($this->field_names);
- unset($this->field_types);
- unset($this->num_rows);
- unset($this->current_row);
- }
-
- return @odbc_close($this->db_connect_id);
- }
- else
- {
- return false;
- }
- }
-
- //
- // Query method
- //
- function sql_query($query = "", $transaction = FALSE)
- {
- if($query != "")
- {
- $this->num_queries++;
-
- if($transaction == BEGIN_TRANSACTION && !$this->in_transaction)
- {
- if(!odbc_autocommit($this->db_connect_id, false))
- {
- return false;
- }
- $this->in_transaction = TRUE;
- }
-
- $query = str_replace("LOWER(", "LCASE(", $query);
-
- if(preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits))
- {
- $query = $limits[1];
-
- if(!empty($limits[2]))
- {
- $row_offset = ($limits[4]) ? $limits[3] : "";
- $num_rows = ($limits[4]) ? $limits[4] : $limits[3];
-
- $query = "TOP " . ($row_offset + $num_rows) . $query;
- }
-
- $this->result = odbc_exec($this->db_connect_id, "SELECT $query");
-
- if($this->result)
- {
- if(empty($this->field_names[$this->result]))
- {
- for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++)
- {
- $this->field_names[$this->result][] = odbc_field_name($this->result, $i);
- $this->field_types[$this->result][] = odbc_field_type($this->result, $i);
- }
- }
-
- $this->current_row[$this->result] = 0;
- $this->result_rowset[$this->result] = array();
-
- $row_outer = (isset($row_offset)) ? $row_offset + 1 : 1;
- $row_outer_max = (isset($num_rows)) ? $row_offset + $num_rows + 1 : 1E9;
- $row_inner = 0;
-
- while(odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max)
- {
- for($j = 0; $j < count($this->field_names[$this->result]); $j++)
- {
- $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1));
- }
-
- $row_outer++;
- $row_inner++;
- }
-
- $this->num_rows[$this->result] = count($this->result_rowset[$this->result]);
-
- odbc_free_result($this->result);
- }
-
- }
- else if(eregi("^INSERT ", $query))
- {
- $this->result = odbc_exec($this->db_connect_id, $query);
-
- if($this->result)
- {
- $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY");
- if($result_id)
- {
- if(odbc_fetch_row($result_id))
- {
- $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1);
- $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
- }
- }
- }
- }
- else
- {
- $this->result = odbc_exec($this->db_connect_id, $query);
-
- if($this->result)
- {
- $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
- }
- }
-
- if(!$this->result)
- {
- if($this->in_transaction)
- {
- odbc_rollback($this->db_connect_id);
- odbc_autocommit($this->db_connect_id, true);
- $this->in_transaction = FALSE;
- }
-
- return false;
- }
-
- if($transaction == END_TRANSACTION && $this->in_transaction)
- {
- $this->in_transaction = FALSE;
-
- if (!@odbc_commit($this->db_connect_id))
- {
- odbc_rollback($this->db_connect_id);
- odbc_autocommit($this->db_connect_id, true);
- return false;
- }
- odbc_autocommit($this->db_connect_id, true);
- }
-
- return $this->result;
- }
- else
- {
- if($transaction == END_TRANSACTION && $this->in_transaction)
- {
- $this->in_transaction = FALSE;
-
- if (!@odbc_commit($this->db_connect_id))
- {
- odbc_rollback($this->db_connect_id);
- odbc_autocommit($this->db_connect_id, true);
- return false;
- }
- odbc_autocommit($this->db_connect_id, true);
- }
-
- return true;
- }
- }
-
- //
- // Other query methods
- //
- function sql_numrows($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- return ($query_id) ? $this->num_rows[$query_id] : false;
- }
-
- function sql_numfields($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- return ($query_id) ? count($this->field_names[$query_id]) : false;
- }
-
- function sql_fieldname($offset, $query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- return ($query_id) ? $this->field_names[$query_id][$offset] : false;
- }
-
- function sql_fieldtype($offset, $query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- return ($query_id) ? $this->field_types[$query_id][$offset] : false;
- }
-
- function sql_fetchrow($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- if($query_id)
- {
- return ($this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id]) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false;
- }
- else
- {
- return false;
- }
- }
-
- function sql_fetchrowset($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- if($query_id)
- {
- return ($this->num_rows[$query_id]) ? $this->result_rowset[$query_id] : false;
- }
- else
- {
- return false;
- }
- }
-
- function sql_fetchfield($field, $row = -1, $query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- if($query_id)
- {
- if($row < $this->num_rows[$query_id])
- {
- $getrow = ($row == -1) ? $this->current_row[$query_id] - 1 : $row;
-
- return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]];
- }
- else
- {
- return false;
- }
- }
- else
- {
- return false;
- }
- }
-
- function sql_rowseek($offset, $query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- if($query_id)
- {
- $this->current_row[$query_id] = $offset - 1;
- return true;
- }
- else
- {
- return false;
- }
- }
-
- function sql_nextid()
- {
- return ($this->next_id[$this->db_connect_id]) ? $this->next_id[$this->db_connect_id] : false;
- }
-
- function sql_affectedrows()
- {
- return ($this->affected_rows[$this->db_connect_id]) ? $this->affected_rows[$this->db_connect_id] : false;
- }
-
- function sql_freeresult($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->result;
- }
-
- unset($this->num_rows[$query_id]);
- unset($this->current_row[$query_id]);
- unset($this->result_rowset[$query_id]);
- unset($this->field_names[$query_id]);
- unset($this->field_types[$query_id]);
-
- return true;
- }
-
- function sql_error($sql = '')
- {
- if (!$this->return_on_error)
- {
- $this_page = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
- $this_page .= '&' . ((!empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING']);
-
- $message = 'SQL ERROR [ ' . SQL_LAYER . ' ]
' . @odbc_errormsg() . '
CALLING PAGE
' . htmlspecialchars($this_page) . (($sql != '') ? '
SQL
' . $sql : '') . '
';
-
- if ($this->transaction)
- {
- $this->sql_transaction('rollback');
- }
-
- trigger_error($message, E_USER_ERROR);
- }
-
- $result = array(
- 'message' => @odbc_errormsg(),
- 'code' => @odbc_error()
- );
-
- return $result;
- }
-
-} // class sql_db
-
-} // if ... define
-
-?>
\ No newline at end of file