5 files changed, 608 insertions, 394 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index afce881eaf..a785c7c8b7 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -228,7 +228,7 @@ class sql_db
 	//         don't want this here by a middle Milestone
 	function sql_numrows($query_id = false)
 	{
-		return FALSE;
+		return false;
 	}
 
 	function sql_affectedrows()
@@ -332,6 +332,7 @@ class sql_db
 					}
 				}
 			}
+
 			return $result;
 		}
 		else
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index bbc4b5d289..b12480e9f9 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -337,8 +337,10 @@ class sql_db
 					}
 				}
 			}
+
 			return $result;
 		}
+
 		return false;
 	}
 
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index bf323ec54e..b411b91a7a 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -337,8 +337,10 @@ class sql_db
 					}
 				}
 			}
+
 			return $result;
 		}
+
 		return false;
 	}
 
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 145afc7e71..ad4a25cf60 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -11,10 +11,10 @@
 /**
 * @ignore
 */
-if(!defined("SQL_LAYER"))
+if(!defined('SQL_LAYER'))
 {
 
-define("SQL_LAYER","oracle");
+define('SQL_LAYER', 'oracle');
 
 /**
 * @package dbal_oracle
@@ -22,42 +22,26 @@ define("SQL_LAYER","oracle");
 */
 class sql_db
 {
-
 	var $db_connect_id;
 	var $query_result;
-	var $in_transaction = 0;
-	var $row = array();
-	var $rowset = array();
+	var $return_on_error = false;
+	var $transaction = false;
+	var $sql_time = 0;
 	var $num_queries = 0;
-	var $last_query_text = "";
+	var $open_queries = array();
 
-	//
-	// Constructor
-	//
-	function sql_db($sqlserver, $sqluser, $sqlpassword, $database="", $persistency = true)
+	var $last_query_text = '';
+
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
 	{
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
-		$this->password = $sqlpassword;
-		$this->server = $sqlserver;
+		$this->server = $sqlserver . (($port) ? ':' . $port : '');
 		$this->dbname = $database;
+		
+		$this->db_connect_id = ($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->server) : @ocinlogon($this->user, $sqlpassword, $this->server);
 
-		if($this->persistency)
-		{
-			$this->db_connect_id = @OCIPLogon($this->user, $this->password, $this->server);
-		}
-		else
-		{
-			$this->db_connect_id = @OCINLogon($this->user, $this->password, $this->server);
-		}
-		if($this->db_connect_id)
-		{
-			return $this->db_connect_id;
-		}
-		else
-		{
-			return false;
-		}
+		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
 
 	//
@@ -65,320 +49,374 @@ class sql_db
 	//
 	function sql_close()
 	{
-		if($this->db_connect_id)
+		if (!$this->db_connect_id)
 		{
-			// Commit outstanding transactions
-			if($this->in_transaction)
-			{
-				OCICommit($this->db_connect_id);
-			}
+			return false;
+		}
 
-			if($this->query_result)
+		if ($this->transaction)
+		{
+			@ocicommit($this->db_connect_id);
+		}
+
+		if (sizeof($this->open_queries))
+		{
+			foreach ($this->open_queries as $i_query_id => $query_id)
 			{
-				@OCIFreeStatement($this->query_result);
+				@ocifreestatement($query_id);
 			}
-			$result = @OCILogoff($this->db_connect_id);
-			return $result;
 		}
-		else
+
+		return @ocilogoff($this->db_connect_id);
+	}
+
+	function sql_return_on_error($fail = false)
+	{
+		$this->return_on_error = $fail;
+	}
+
+	function sql_num_queries()
+	{
+		return $this->num_queries;
+	}
+
+	function sql_transaction($status = 'begin')
+	{
+		switch ($status)
 		{
-			return false;
+			case 'begin':
+				$result = true;
+				$this->transaction = true;
+				break;
+
+			case 'commit':
+				$result = @ocicommit($this->db_connect_id);
+				$this->transaction = false;
+
+				if (!$result)
+				{
+					@ocirollback($this->db_connect_id);
+				}
+				break;
+
+			case 'rollback':
+				$result = @ocirollback($this->db_connect_id);
+				$this->transaction = false;
+				break;
+
+			default:
+				$result = true;
 		}
+
+		return $result;
 	}
 
-	//
 	// Base query method
-	//
-	function sql_query($query = "", $transaction = FALSE)
+	function sql_query($query = '', $cache_ttl = 0)
 	{
-		// Remove any pre-existing queries
-		unset($this->query_result);
-
-		// Put us in transaction mode because with Oracle as soon as you make a query you're in a transaction
-		$this->in_transaction = TRUE;
-
-		if($query != "")
+		if ($query != '')
 		{
-			$this->last_query = $query;
-			$this->num_queries++;
+			global $cache;
 
-			if(eregi("LIMIT", $query))
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
 			{
-				preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits);
+				$this->sql_report('start', $query);
+			}
+		
+			$this->last_query_text = $query;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			
+			if (!$this->query_result)
+			{
+				$this->num_queries++;
 
-				$query = $limits[1];
-				if($limits[3])
+				$in_transaction = false;
+				if (!$this->transaction)
 				{
-					$row_offset = $limits[2];
-					$num_rows = $limits[3];
+					$this->sql_transaction('begin');
 				}
 				else
 				{
-					$row_offset = 0;
-					$num_rows = $limits[2];
+					$in_transaction = true;
 				}
-			}
 
-			if(eregi("^(INSERT|UPDATE) ", $query))
-			{
-				$query = preg_replace("/\\\'/s", "''", $query);
-			}
+				$this->query_result = @ociparse($this->db_connect_id, $query);
+				$success = @ociexecute($this->query_result, OCI_DEFAULT);
 
-			$this->query_result = @OCIParse($this->db_connect_id, $query);
-			$success = @OCIExecute($this->query_result, OCI_DEFAULT);
-		}
-		if($success)
-		{
-			if($transaction == END_TRANSACTION)
+				if (!$success)
+				{
+					$this->sql_error($query);
+					$this->query_result = false;
+				}
+				else
+				{
+					if (!$in_transaction)
+					{
+						$this->sql_transaction('commit');
+					}
+				}
+				
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') !== false && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
 			{
-				OCICommit($this->db_connect_id);
-				$this->in_transaction = FALSE;
+				$this->sql_report('fromcache', $query);
 			}
-
-			unset($this->row[$this->query_result]);
-			unset($this->rowset[$this->query_result]);
-			$this->last_query_text[$this->query_result] = $query;
-
-			return $this->query_result;
 		}
 		else
 		{
-			if($this->in_transaction)
-			{
-				OCIRollback($this->db_connect_id);
-			}
 			return false;
 		}
+
+		return ($this->query_result) ? $this->query_result : false;
 	}
 
-	//
-	// Other query methods
-	//
-	function sql_numrows($query_id = 0)
-	{
-		if(!$query_id)
-		{
-			$query_id = $this->query_result;
-		}
-		if($query_id)
+	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) 
+	{ 
+		if ($query != '') 
 		{
-			$result = @OCIFetchStatement($query_id, $this->rowset);
-			// OCIFetchStatment kills our query result so we have to execute the statment again
-			// if we ever want to use the query_id again.
-			@OCIExecute($query_id, OCI_DEFAULT);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+			$this->query_result = false; 
+
+			$query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset;
+
+			return $this->sql_query($query, $cache_ttl); 
+		} 
+		else 
+		{ 
+			return false; 
+		} 
 	}
-	function sql_affectedrows($query_id = 0)
+
+	// Idea for this from Ikonboard
+	function sql_build_array($query, $assoc_ary = false)
 	{
-		if(!$query_id)
+		if (!is_array($assoc_ary))
 		{
-			$query_id = $this->query_result;
+			return false;
 		}
-		if($query_id)
+
+		$fields = array();
+		$values = array();
+		if ($query == 'INSERT')
 		{
-			$result = @OCIRowCount($query_id);
-			return $result;
+			foreach ($assoc_ary as $key => $var)
+			{
+				$fields[] = $key;
+
+				if (is_null($var))
+				{
+					$values[] = 'NULL';
+				}
+				elseif (is_string($var))
+				{
+					$values[] = "'" . $this->sql_escape($var) . "'";
+				}
+				else
+				{
+					$values[] = (is_bool($var)) ? intval($var) : $var;
+				}
+			}
+
+			$query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
 		}
-		else
+		else if ($query == 'UPDATE' || $query == 'SELECT')
 		{
-			return false;
+			$values = array();
+			foreach ($assoc_ary as $key => $var)
+			{
+				if (is_null($var))
+				{
+					$values[] = "$key = NULL";
+				}
+				elseif (is_string($var))
+				{
+					$values[] = "$key = '" . $this->sql_escape($var) . "'";
+				}
+				else
+				{
+					$values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
+				}
+			}
+			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
 		}
+
+		return $query;
 	}
-	function sql_numfields($query_id = 0)
+
+	// Other query methods
+	//
+	// NOTE :: Want to remove _ALL_ reliance on sql_numrows from core code ...
+	//         don't want this here by a middle Milestone
+	function sql_numrows($query_id = false)
 	{
-		if(!$query_id)
+		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
-		{
-			$result = @OCINumCols($query_id);
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+
+		$result = @ocifetchstatement($query_id, $this->rowset);
+		// OCIFetchStatment kills our query result so we have to execute the statment again
+		// if we ever want to use the query_id again.
+		@ociexecute($query_id, OCI_DEFAULT);
+
+		return $result;
 	}
-	function sql_fieldname($offset, $query_id = 0)
+
+	function sql_affectedrows()
 	{
-		// OCIColumnName uses a 1 based array so we have to up the offset by 1 in here to maintain
-		// full abstraction compatibitly
-		$offset += 1;
-		if(!$query_id)
-		{
-			$query_id = $this->query_result;
-		}
-		if($query_id)
-		{
-			$result = strtolower(@OCIColumnName($query_id, $offset));
-			return $result;
-		}
-		else
-		{
-			return false;
-		}
+		$query_id = $this->query_result;
+
+		return ($query_id) ? @ocirowcount($query_id) : false;
 	}
-	function sql_fieldtype($offset, $query_id = 0)
+
+	function sql_fetchrow($query_id = false)
 	{
-		// This situation is the same as fieldname
-		$offset += 1;
-		if(!$query_id)
+		global $cache;
+
+		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if (isset($cache->sql_rowset[$query_id]))
 		{
-			$result = @OCIColumnType($query_id, $offset);
-			return $result;
+			return $cache->sql_fetchrow($query_id);
 		}
-		else
+		
+		$row = array();
+		$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
+
+		if (!$result || !$row)
 		{
 			return false;
 		}
-	}
-	function sql_fetchrow($query_id = 0, $debug = FALSE)
-	{
-		if(!$query_id)
-		{
-			$query_id = $this->query_result;
-		}
-		if($query_id)
-		{
-			$result_row = "";
-			$result = @OCIFetchInto($query_id, $result_row, OCI_ASSOC+OCI_RETURN_NULLS);
-			if($debug)
-			{
-				echo "Query was: ".$this->last_query . "<br>";
-				echo "Result: $result<br>";
-				echo "Query ID: $query_id<br>";
-				echo "<pre>";
-				var_dump($result_row);
-				echo "</pre>";
-			}
-			if($result_row == "")
-			{
-				return false;
-			}
 
-			for($i = 0; $i < count($result_row); $i++)
+		$result_row = array();
+		foreach ($row as $key => $value)
+		{
+			// OCI->CLOB?
+			if (is_object($value))
 			{
-				list($key, $val) = each($result_row);
-				$return_arr[strtolower($key)] = $val;
+				$value = ($value->size()) ? $value->read($value->size()) : '';
 			}
-			$this->row[$query_id] = $return_arr;
-
-			return $this->row[$query_id];
-		}
-		else
-		{
-			return false;
+			
+			$result_row[strtolower($key)] = $value;
 		}
+		$this->row[$query_id] = $result_row;
+
+		return $this->row[$query_id];
 	}
-	// This function probably isn't as efficant is it could be but any other way I do it
-	// I end up losing 1 row...
-	function sql_fetchrowset($query_id = 0)
+
+	function sql_fetchrowset($query_id = false)
 	{
-		if(!$query_id)
+		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if ($query_id)
 		{
-			$rows = @OCIFetchStatement($query_id, $results);
-			@OCIExecute($query_id, OCI_DEFAULT);
-			for($i = 0; $i <= $rows; $i++)
-			{
-				@OCIFetchInto($query_id, $tmp_result, OCI_ASSOC+OCI_RETURN_NULLS);
+			unset($this->rowset[$query_id]);
+			unset($this->row[$query_id]);
 
-				for($j = 0; $j < count($tmp_result); $j++)
-				{
-					list($key, $val) = each($tmp_result);
-					$return_arr[strtolower($key)] = $val;
-				}
-				$result[] = $return_arr;
+			$result = array();
+			while ($this->rowset[$query_id] = $this->sql_fetchrow($query_id))
+			{
+				$result[] = $this->rowset[$query_id];
 			}
 			return $result;
 		}
-		else
-		{
-			return false;
-		}
+		
+		return false;
 	}
-	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
+
+	function sql_fetchfield($field, $rownum = -1, $query_id = false)
 	{
-		if(!$query_id)
+		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if ($query_id)
 		{
-			if($rownum > -1)
+			if ($rownum > -1)
 			{
 				// Reset the internal rownum pointer.
-				@OCIExecute($query_id, OCI_DEFAULT);
-				for($i = 0; $i < $rownum; $i++)
-				  {
-						// Move the interal pointer to the row we want
-						@OCIFetch($query_id);
-				  }
+				@ociexecute($query_id, OCI_DEFAULT);
+				for ($i = 0; $i < $rownum; $i++)
+				{
+					// Move the interal pointer to the row we want
+					@ocifetch($query_id);
+				}
+				
 				// Get the field data.
-				$result = @OCIResult($query_id, strtoupper($field));
+				$result = @ociresult($query_id, strtoupper($field));
 			}
 			else
 			{
 				// The internal pointer should be where we want it
 				// so we just grab the field out of the current row.
-				$result = @OCIResult($query_id, strtoupper($field));
+				$result = @ociresult($query_id, strtoupper($field));
 			}
+
 			return $result;
 		}
-		else
-		{
-			return false;
-		}
+		
+		return false;
 	}
-	function sql_rowseek($rownum, $query_id = 0)
+
+	function sql_rowseek($rownum, $query_id = false)
 	{
-		if(!$query_id)
+		if (!$query_id)
 		{
-				$query_id = $this->query_result;
+			$query_id = $this->query_result;
 		}
-		if($query_id)
+
+		if ($query_id)
 		{
-				@OCIExecute($query_id, OCI_DEFAULT);
-			for($i = 0; $i < $rownum; $i++)
-				{
-					@OCIFetch($query_id);
-				}
-			$result = @OCIFetch($query_id);
+			@ociexecute($query_id, OCI_DEFAULT);
+
+			for ($i = 0; $i < $rownum; $i++)
+			{
+				@ocifetch($query_id);
+			}
+			$result = @ocifetch($query_id);
+
 			return $result;
 		}
-		else
-		{
-				return false;
-		}
+		
+		return false;
 	}
-	function sql_nextid($query_id = 0)
+
+	function sql_nextid()
 	{
-		if(!$query_id)
-		{
-			$query_id = $this->query_result;
-		}
-		if($query_id && $this->last_query_text[$query_id] != "")
+		$query_id = $this->query_result;
+
+		if ($query_id && $this->last_query_text != '')
 		{
-			if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename))
+			if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
 			{
-				$query = "SELECT ".$tablename[2]."_id_seq.currval FROM DUAL";
-				$stmt = @OCIParse($this->db_connect_id, $query);
-				@OCIExecute($stmt,OCI_DEFAULT );
-				$temp_result = @OCIFetchInto($stmt, $temp_result, OCI_ASSOC+OCI_RETURN_NULLS);
-				if($temp_result)
+				$query = 'SELECT ' . $tablename[1] . '_id_seq.currval FROM DUAL';
+				$stmt = @ociparse($this->db_connect_id, $query);
+				@ociexecute($stmt,OCI_DEFAULT );
+
+				$temp_result = @ocifetchinto($stmt, $temp_result, OCI_ASSOC + OCI_RETURN_NULLS);
+
+				if ($temp_result)
 				{
 					return $temp_result['CURRVAL'];
 				}
@@ -387,80 +425,170 @@ class sql_db
 					return false;
 				}
 			}
-			else
-			{
-				return false;
-			}
-		}
-		else
-		{
-			return false;
 		}
+
+		return false;
 	}
 
-	function sql_nextid($query_id = 0)
+	function sql_freeresult($query_id = false)
 	{
-		if(!$query_id)
+		if (!$query_id)
 		{
 			$query_id = $this->query_result;
 		}
-		if($query_id && $this->last_query_text[$query_id] != "")
-		{
-			if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename))
-			{
-				$query = "SELECT ".$tablename[2]."_id_seq.CURRVAL FROM DUAL";
-				$temp_q_id =  @OCIParse($this->db_connect_id, $query);
-				@OCIExecute($temp_q_id, OCI_DEFAULT);
-				@OCIFetchInto($temp_q_id, $temp_result, OCI_ASSOC+OCI_RETURN_NULLS);
 
-				if($temp_result)
-				{
-					return $temp_result['CURRVAL'];
-				}
-				else
-				{
-					return false;
-				}
-			}
-			else
-			{
-				return false;
-			}
-		}
-		else
+		if (isset($this->open_queries[(int) $query_id]))
 		{
-			return false;
+			unset($this->open_queries[(int) $query_id]);
+			return @ocifreestatement($query_id);
 		}
-	}
 
+		return false;
+	}
 
+	function sql_escape($msg)
+	{
+		return str_replace("'", "''", str_replace('\\', '\\\\', $msg));
+	}
 
-	function sql_freeresult($query_id = 0)
+	function sql_error($sql = '')
 	{
-		if(!$query_id)
+		$error = @ocierror();
+		$error = (!$error) ? @ocierror($this->query_result) : $error;
+		$error = (!$error) ? @ocierror($this->db_connect_id) : $error;
+
+		if ($error)
 		{
-				$query_id = $this->query_result;
+			$this->last_error_result = $error;
 		}
-		if($query_id)
+		else
 		{
-				$result = @OCIFreeStatement($query_id);
-				return $result;
+			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
 		}
-		else
+
+		if (!$this->return_on_error)
 		{
-				return false;
+			$this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
+			$this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : ''));
+
+			$message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']<br /><br /><u>CALLING PAGE</u><br /><br />'  . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />';
+
+			if ($this->transaction)
+			{
+				$this->sql_transaction('rollback');
+			}
+			
+			trigger_error($message, E_USER_ERROR);
 		}
+
+		return $error;
 	}
-	function sql_error($query_id  = 0)
+
+	function sql_report($mode, $query = '')
 	{
-		if(!$query_id)
+		if (empty($_GET['explain']))
 		{
-			$query_id = $this->query_result;
+			return;
+		}
+
+		global $cache, $starttime, $phpbb_root_path;
+		static $curtime, $query_hold, $html_hold;
+		static $sql_report = '';
+		static $cache_num_queries = 0;
+
+		if (!$query && !empty($query_hold))
+		{
+			$query = $query_hold;
+		}
+
+		switch ($mode)
+		{
+			case 'display':
+				if (!empty($cache))
+				{
+					$cache->unload();
+				}
+				$this->sql_close();
+
+				$mtime = explode(' ', microtime());
+				$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+				echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n";
+				echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n";
+				echo 'td.cat	{ background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n";
+				echo '</style><title>' . $msg_title . '</title></head><body>';
+				echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> &nbsp; &nbsp; &nbsp;</td></tr></table><br clear="all"/><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td height="40" align="center" valign="middle"><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($cache_num_queries) ? " + $cache_num_queries " . (($cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></td></tr><tr><td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td></tr></table><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td>';
+				echo $sql_report;
+				echo '</td></tr></table><br /></body></html>';
+				exit;
+				break;
+
+			case 'start':
+				$query_hold = $query;
+				$html_hold = '';
+
+				$curtime = explode(' ', microtime());
+				$curtime = $curtime[0] + $curtime[1];
+				break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @ociparse($this->db_connect_id, $query);
+				$success = @ociexecute($result, OCI_DEFAULT);
+				$row = array();
+
+				while ($void = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$time_cache = $endtime - $curtime;
+				$time_db = $splittime - $endtime;
+				$color = ($time_db > $time_cache) ? 'green' : 'red';
+
+				$sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query results obtained from the cache</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table><p align="center">';
+
+				$sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p>';
+
+				// Pad the start time to not interfere with page timing
+				$starttime += $time_db;
+
+				@ocifreestatement($result);
+				$cache_num_queries++;
+				break;
+
+			case 'stop':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table> ' . $html_hold . '<p align="center">';
+
+				if ($this->query_result)
+				{
+					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
+					{
+						$sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | ';
+					}
+					$sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>';
+				}
+				else
+				{
+					$error = $this->sql_error();
+					$sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
+				}
+
+				$sql_report .= '</p>';
+
+				$this->sql_time += $endtime - $curtime;
+				break;
 		}
-		$result  = @OCIError($query_id);
-		return $result;
 	}
 
+
 } // class sql_db
 
 } // if ... define
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 00d80ac4db..d74a535cea 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -11,10 +11,10 @@
 /**
 * @ignore
 */
-if (!defined("SQL_LAYER"))
+if (!defined('SQL_LAYER'))
 {
 
-define("SQL_LAYER","sqlite");
+define('SQL_LAYER', 'sqlite');
 
 /**
 * @package dbal_sqlite
@@ -26,24 +26,30 @@ class sql_db
 	var $query_result;
 	var $return_on_error = false;
 	var $transaction = false;
-	var $sql_report = '';
 	var $sql_time = 0;
 	var $num_queries = 0;
-	var $open_queries = array();
 
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
 	{
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
 		$this->server = $sqlserver . (($port) ? ':' . $port : '');
 		$this->dbname = $database;
 
-		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0, $error) : @sqlite_open($this->server, 0, $error);
+		$error = '';
+		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error);
 
-		return ($this->db_connect_id) ? true : $error;
+		if ($this->db_connect_id)
+		{
+			@sqlite_query('PRAGMA short_column_names = 1', $this->db_connect_id);
+		}
+		
+		return ($this->db_connect_id) ? true : array('message' => $error);
 	}
 
+	//
 	// Other base methods
+	//
 	function sql_close()
 	{
 		if (!$this->db_connect_id)
@@ -69,18 +75,23 @@ class sql_db
 		switch ($status)
 		{
 			case 'begin':
-				$this->transaction = true;
 				$result = @sqlite_query('BEGIN', $this->db_connect_id);
+				$this->transaction = true;
 				break;
 
 			case 'commit':
-				$this->transaction = false;
 				$result = @sqlite_query('COMMIT', $this->db_connect_id);
+				$this->transaction = false;
+				
+				if (!$result)
+				{
+					@sqlite_query('ROLLBACK', $this->db_connect_id);
+				}
 				break;
 
 			case 'rollback':
-				$this->transaction = false;
 				$result = @sqlite_query('ROLLBACK', $this->db_connect_id);
+				$this->transaction = false;
 				break;
 
 			default:
@@ -91,91 +102,44 @@ class sql_db
 	}
 
 	// Base query method
-	function sql_query($query = '', $expire_time = 0)
+	function sql_query($query = '', $cache_ttl = 0)
 	{
 		if ($query != '')
 		{
 			global $cache;
 
-			$query = preg_replace('#FROM \((.*?)\)(,|[\n\t ]+?WHERE) #s', 'FROM \1\2 ', $query);
+			$query = preg_replace('#FROM \((.*?)\)(,|[\n\r\t ]+?WHERE) #s', 'FROM \1\2 ', $query);
 
-			if (!$expire_time || !$cache->sql_load($query, $expire_time))
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
 			{
-				if ($expire_time)
-				{
-					$cache_result = true;
-				}
-
-				$this->query_result = false;
-				$this->num_queries++;
+				$this->sql_report('start', $query);
+			}
 
-				if (!empty($_GET['explain']))
-				{
-					global $starttime;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
 
-					$curtime = explode(' ', microtime());
-					$curtime = $curtime[0] + $curtime[1] - $starttime;
-				}
+			if (!$this->query_result)
+			{
+				$this->num_queries++;
 
-				if (!($this->query_result = @sqlite_query($query, $this->db_connect_id)))
+				if (($this->query_result = @sqlite_query($query, $this->db_connect_id)) === false)
 				{
 					$this->sql_error($query);
 				}
 
-				if (!empty($_GET['explain']))
+				if (defined('DEBUG_EXTRA'))
 				{
-					$endtime = explode(' ', microtime());
-					$endtime = $endtime[0] + $endtime[1] - $starttime;
-
-					$this->sql_report .= "<pre>Query:\t" . htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n\t", $query)) . "\n\n";
-
-					if ($this->query_result)
-					{
-						$this->sql_report .= "Time before:  $curtime\nTime after:   $endtime\nElapsed time: <b>" . ($endtime - $curtime) . "</b>\n</pre>";
-					}
-					else
-					{
-						$error = $this->sql_error();
-						$this->sql_report .= '<b>FAILED</b> - SQLite ' . $error['code'] . ': ' . htmlspecialchars($error['message']) . '<br><br><pre>';
-					}
-
-					$this->sql_time += $endtime - $curtime;
-
-					if (preg_match('#^SELECT#', $query))
-					{
-						$html_table = FALSE;
-						if ($result = @sqlite_query("EXPLAIN $query", $this->db_connect_id))
-						{
-							while ($row = @sqlite_fetch_array($result, @sqlite_ASSOC))
-							{
-								if (!$html_table && sizeof($row))
-								{
-									$html_table = TRUE;
-									$this->sql_report .= "<table width=100% border=1 cellpadding=2 cellspacing=1>\n";
-									$this->sql_report .= "<tr>\n<td><b>" . implode("</b></td>\n<td><b>", array_keys($row)) . "</b></td>\n</tr>\n";
-								}
-								$this->sql_report .= "<tr>\n<td>" . implode("&nbsp;</td>\n<td>", array_values($row)) . "&nbsp;</td>\n</tr>\n";
-							}
-						}
-
-						if ($html_table)
-						{
-							$this->sql_report .= '</table><br>';
-						}
-					}
-
-					$this->sql_report .= "<hr>\n";
+					$this->sql_report('stop', $query);
 				}
 
-				if (preg_match('#^SELECT#', $query))
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
 				{
-					$this->open_queries[] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 			}
-
-			if (!empty($cache_result))
+			else if (defined('DEBUG_EXTRA'))
 			{
-				$cache->sql_save($query, $this->query_result);
+				$this->sql_report('fromcache', $query);
 			}
 		}
 		else
@@ -186,20 +150,26 @@ class sql_db
 		return ($this->query_result) ? $this->query_result : false;
 	}
 
-	function sql_query_limit($query, $total, $offset = 0, $expire_time = 0)
-	{
-		if ($query != '')
+	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) 
+	{ 
+		if ($query != '') 
 		{
-			$this->query_result = false;
+			$this->query_result = false; 
+
+			// if $total is set to 0 we do not want to limit the number of rows
+			if ($total == 0)
+			{
+				$total = -1;
+			}
 
-			$query .= ' LIMIT ' . ((!empty($offset)) ? $total . ' OFFSET ' . $offset : $total);
+			$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
 
-			return $this->sql_query($query, $expire_time);
-		}
-		else
-		{
-			return false;
-		}
+			return $this->sql_query($query, $cache_ttl); 
+		} 
+		else 
+		{ 
+			return false; 
+		} 
 	}
 
 	// Idea for this from Ikonboard
@@ -234,7 +204,7 @@ class sql_db
 
 			$query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')';
 		}
-		else if ($query == 'UPDATE')
+		else if ($query == 'UPDATE' || $query == 'SELECT')
 		{
 			$values = array();
 			foreach ($assoc_ary as $key => $var)
@@ -252,7 +222,7 @@ class sql_db
 					$values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var";
 				}
 			}
-			$query = implode(', ', $values);
+			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
 		}
 
 		return $query;
@@ -277,7 +247,7 @@ class sql_db
 		return ($this->db_connect_id) ? @sqlite_changes($this->db_connect_id) : false;
 	}
 
-	function sql_fetchrow($query_id = 0)
+	function sql_fetchrow($query_id = false)
 	{
 		global $cache;
 
@@ -286,15 +256,15 @@ class sql_db
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if (isset($cache->sql_rowset[$query_id]))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
 
-		return ($query_id) ? @sqlite_fetch_array($query_id, @sqlite_ASSOC) : false;
+		return ($query_id) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false;
 	}
 
-	function sql_fetchrowset($query_id = 0)
+	function sql_fetchrowset($query_id = false)
 	{
 		if (!$query_id)
 		{
@@ -305,19 +275,19 @@ class sql_db
 		{
 			unset($this->rowset[$query_id]);
 			unset($this->row[$query_id]);
-			while ($this->rowset[$query_id] = @sqlite_fetch_array($query_id, @sqlite_ASSOC))
+
+			$result = array();
+			while ($this->rowset[$query_id] = $this->sql_fetchrow($query_id))
 			{
 				$result[] = $this->rowset[$query_id];
 			}
 			return $result;
 		}
-		else
-		{
-			return false;
-		}
+		
+		return false;
 	}
 
-	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
+	function sql_fetchfield($field, $rownum = -1, $query_id = false)
 	{
 		if (!$query_id)
 		{
@@ -326,11 +296,22 @@ class sql_db
 
 		if ($query_id)
 		{
-			return ($rownum > -1) ? ((@sqlite_seek($query_id, $rownum)) ? @sqlite_column($query_id, $field) : false) : @sqlite_column($query_id, $field);
+			if ($rownum > -1)
+			{
+				$result = (@sqlite_seek($query_id, $rownum)) ? @sqlite_column($query_id, $field) : false;
+			}
+			else
+			{
+				$result = @sqlite_column($query_id, $field);
+			}
+
+			return $result;
 		}
+
+		return false;
 	}
 
-	function sql_rowseek($rownum, $query_id = 0)
+	function sql_rowseek($rownum, $query_id = false)
 	{
 		if (!$query_id)
 		{
@@ -359,8 +340,8 @@ class sql_db
 	{
 		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']);
+			$this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF'];
+			$this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : ''));
 
 			$message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @sqlite_error_string(@sqlite_last_error($this->db_connect_id)) . '<br /><br /><u>CALLING PAGE</u><br /><br />'  . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />';
 
@@ -380,6 +361,106 @@ class sql_db
 		return $result;
 	}
 
+	function sql_report($mode, $query = '')
+	{
+		if (empty($_GET['explain']))
+		{
+			return;
+		}
+
+		global $cache, $starttime, $phpbb_root_path;
+		static $curtime, $query_hold, $html_hold;
+		static $sql_report = '';
+		static $cache_num_queries = 0;
+
+		if (!$query && !empty($query_hold))
+		{
+			$query = $query_hold;
+		}
+
+		switch ($mode)
+		{
+			case 'display':
+				if (!empty($cache))
+				{
+					$cache->unload();
+				}
+				$this->sql_close();
+
+				$mtime = explode(' ', microtime());
+				$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+				echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n";
+				echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n";
+				echo 'td.cat	{ background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n";
+				echo '</style><title>' . $msg_title . '</title></head><body>';
+				echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> &nbsp; &nbsp; &nbsp;</td></tr></table><br clear="all"/><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td height="40" align="center" valign="middle"><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($cache_num_queries) ? " + $cache_num_queries " . (($cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></td></tr><tr><td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td></tr></table><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td>';
+				echo $sql_report;
+				echo '</td></tr></table><br /></body></html>';
+				exit;
+				break;
+
+			case 'start':
+				$query_hold = $query;
+				$html_hold = '';
+
+				$curtime = explode(' ', microtime());
+				$curtime = $curtime[0] + $curtime[1];
+				break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @sqlite_query($query, $this->db_connect_id);
+				while ($void = @sqlite_fetch_array($result, SQLITE_ASSOC))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$time_cache = $endtime - $curtime;
+				$time_db = $splittime - $endtime;
+				$color = ($time_db > $time_cache) ? 'green' : 'red';
+
+				$sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query results obtained from the cache</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table><p align="center">';
+
+				$sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p>';
+
+				// Pad the start time to not interfere with page timing
+				$starttime += $time_db;
+
+				$cache_num_queries++;
+				break;
+
+			case 'stop':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table> ' . $html_hold . '<p align="center">';
+
+				if ($this->query_result)
+				{
+					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
+					{
+						$sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | ';
+					}
+					$sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>';
+				}
+				else
+				{
+					$error = $this->sql_error();
+					$sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
+				}
+
+				$sql_report .= '</p>';
+
+				$this->sql_time += $endtime - $curtime;
+				break;
+		}
+	}
+
 } // class sql_db
 
 } // if ... define