1 files changed, 72 insertions, 121 deletions
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index 6d3438006f..bde53beab6 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -24,9 +24,8 @@ if (!defined('SQL_LAYER'))
 */
 class dbal_mysql4 extends dbal
 {
-
 	/**
-	* Connect to sql server
+	* Connect to server
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
 	{
@@ -48,27 +47,9 @@ class dbal_mysql4 extends dbal
 		return $this->sql_error('');
 	}
 
-	//
-	// Other base methods
-	//
-	function sql_close()
-	{
-		if (!$this->db_connect_id)
-		{
-			return false;
-		}
-
-		if (sizeof($this->open_queries))
-		{
-			foreach ($this->open_queries as $i_query_id => $query_id)
-			{
-				@mysql_free_result($query_id);
-			}
-		}
-
-		return @mysql_close($this->db_connect_id);
-	}
-
+	/**
+	* sql transaction
+	*/
 	function sql_transaction($status = 'begin')
 	{
 		switch ($status)
@@ -100,7 +81,9 @@ class dbal_mysql4 extends dbal
 		return $result;
 	}
 
-	// Base query method
+	/**
+	* Base query method
+	*/
 	function sql_query($query = '', $cache_ttl = 0)
 	{
 		if ($query != '')
@@ -133,7 +116,6 @@ class dbal_mysql4 extends dbal
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$cache->sql_save($query, $this->query_result, $cache_ttl);
-					// mysql_free_result called within sql_save()
 				}
 				else if (strpos($query, 'SELECT') !== false && $this->query_result)
 				{
@@ -153,6 +135,9 @@ class dbal_mysql4 extends dbal
 		return ($this->query_result) ? $this->query_result : false;
 	}
 
+	/**
+	* Build LIMIT query
+	*/
 	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) 
 	{ 
 		if ($query != '') 
@@ -175,10 +160,10 @@ class dbal_mysql4 extends dbal
 		} 
 	}
 
-	// Other query methods
-	//
-	// NOTE :: Want to remove _ALL_ reliance on sql_numrows from core code ...
-	//         don't want this here by a middle Milestone
+	/**
+	* Return number of rows
+	* Not used within core code
+	*/
 	function sql_numrows($query_id = false)
 	{
 		if (!$query_id)
@@ -189,11 +174,17 @@ class dbal_mysql4 extends dbal
 		return ($query_id) ? @mysql_num_rows($query_id) : false;
 	}
 
+	/**
+	* Return number of affected rows
+	*/
 	function sql_affectedrows()
 	{
 		return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false;
 	}
 
+	/**
+	* Fetch current row
+	*/
 	function sql_fetchrow($query_id = false)
 	{
 		global $cache;
@@ -211,30 +202,11 @@ class dbal_mysql4 extends dbal
 		return ($query_id) ? @mysql_fetch_assoc($query_id) : false;
 	}
 
-	function sql_fetchrowset($query_id = false)
-	{
-		if (!$query_id)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id)
-		{
-			unset($this->rowset[$query_id]);
-			unset($this->row[$query_id]);
-
-			$result = array();
-			while ($this->rowset[$query_id] = $this->sql_fetchrow($query_id))
-			{
-				$result[] = $this->rowset[$query_id];
-			}
-			return $result;
-		}
-		
-		return false;
-	}
-
-	function sql_fetchfield($field, $rownum = -1, $query_id = false)
+	/**
+	* Fetch field
+	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
+	*/
+	function sql_fetchfield($field, $rownum = false, $query_id = false)
 	{
 		if (!$query_id)
 		{
@@ -243,38 +215,24 @@ class dbal_mysql4 extends dbal
 
 		if ($query_id)
 		{
-			if ($rownum > -1)
+			if ($rownum === false)
 			{
-				$result = @mysql_result($query_id, $rownum, $field);
+				$row = $this->sql_fetchrow($query_id);
+				return isset($row[$field]) ? $row[$field] : false;
 			}
 			else
 			{
-				if (empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
-				{
-					if ($this->row[$query_id] = $this->sql_fetchrow($query_id))
-					{
-						$result = $this->row[$query_id][$field];
-					}
-				}
-				else
-				{
-					if ($this->rowset[$query_id])
-					{
-						$result = $this->rowset[$query_id][$field];
-					}
-					elseif ($this->row[$query_id])
-					{
-						$result = $this->row[$query_id][$field];
-					}
-				}
+				return @mysql_result($query_id, $rownum, $field);
 			}
-
-			return $result;
 		}
 
 		return false;
 	}
 
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
 	function sql_rowseek($rownum, $query_id = false)
 	{
 		if (!$query_id)
@@ -285,11 +243,17 @@ class dbal_mysql4 extends dbal
 		return ($query_id) ? @mysql_data_seek($query_id, $rownum) : false;
 	}
 
+	/**
+	* Get last inserted id after insert statement
+	*/
 	function sql_nextid()
 	{
 		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false;
 	}
 
+	/**
+	* Free sql result
+	*/
 	function sql_freeresult($query_id = false)
 	{
 		if (!$query_id)
@@ -306,12 +270,19 @@ class dbal_mysql4 extends dbal
 		return false;
 	}
 
+	/**
+	* Escape string used in sql query
+	*/
 	function sql_escape($msg)
 	{
 		return mysql_escape_string($msg);
 	}
 	
-	function db_sql_error()
+	/**
+	* return sql error array
+	* @private
+	*/
+	function _sql_error()
 	{
 		return array(
 			'message'	=> @mysql_error(),
@@ -319,22 +290,31 @@ class dbal_mysql4 extends dbal
 		);
 	}
 
-	function _sql_report($mode, $query = '')
+	/**
+	* Close sql connection
+	* @private
+	*/
+	function _sql_close()
 	{
-		global $cache, $starttime, $phpbb_root_path;
+		return @mysql_close($this->db_connect_id);
+	}
 
+	/**
+	* Build db-specific report
+	* @private
+	*/
+	function _sql_report($mode, $query = '')
+	{
 		switch ($mode)
 		{
 			case 'start':
-				$this->query_hold = $query;
-				$this->html_hold = '';
 
 				$explain_query = $query;
 				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
 				{
 					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
 				}
-				elseif (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
 				{
 					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
 				}
@@ -343,32 +323,14 @@ class dbal_mysql4 extends dbal
 				{
 					$html_table = false;
 
-					if ($result = mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
+					if ($result = @mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
 					{
-						while ($row = mysql_fetch_assoc($result))
+						while ($row = @mysql_fetch_assoc($result))
 						{
-							if (!$html_table && sizeof($row))
-							{
-								$html_table = true;
-								$this->html_hold .= '<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>';
-								
-								foreach (array_keys($row) as $val)
-								{
-									$this->html_hold .= '<th nowrap="nowrap">' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
-								}
-								$this->html_hold .= '</tr>';
-							}
-							$this->html_hold .= '<tr>';
-
-							$class = 'row1';
-							foreach (array_values($row) as $val)
-							{
-								$class = ($class == 'row1') ? 'row2' : 'row1';
-								$this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
-							}
-							$this->html_hold .= '</tr>';
+							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
 						}
 					}
+					@mysql_free_result($result);
 
 					if ($html_table)
 					{
@@ -376,36 +338,25 @@ class dbal_mysql4 extends dbal
 					}
 				}
 
-				$this->curtime = explode(' ', microtime());
-				$this->curtime = $this->curtime[0] + $this->curtime[1];
-				break;
+			break;
 
 			case 'fromcache':
 				$endtime = explode(' ', microtime());
 				$endtime = $endtime[0] + $endtime[1];
 
-				$result = mysql_query($query, $this->db_connect_id);
-				while ($void = mysql_fetch_assoc($result))
+				$result = @mysql_query($query, $this->db_connect_id);
+				while ($void = @mysql_fetch_assoc($result))
 				{
 					// Take the time spent on parsing rows into account
 				}
+				@mysql_free_result($result);
+
 				$splittime = explode(' ', microtime());
 				$splittime = $splittime[0] + $splittime[1];
 
-				$time_cache = $endtime - $this->curtime;
-				$time_db = $splittime - $endtime;
-				$color = ($time_db > $time_cache) ? 'green' : 'red';
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
 
-				$this->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">';
-
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->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;
-
-				mysql_free_result($result);
-				$this->cache_num_queries++;
-				break;
+			break;
 		}
 	}
 }