1 files changed, 70 insertions, 42 deletions
diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index 6ebc891673..dfdbfe15e6 100644
--- a/phpBB/phpbb/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -12,14 +16,13 @@ namespace phpbb\db\driver;
 /**
 * MSSQL Database Abstraction Layer
 * Minimum Requirement is MSSQL 2000+
-* @package dbal
 */
 class mssql extends \phpbb\db\driver\driver
 {
 	var $connect_error = '';
 
 	/**
-	* Connect to server
+	* {@inheritDoc}
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
 	{
@@ -55,10 +58,7 @@ class mssql extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
+	* {@inheritDoc}
 	*/
 	function sql_server_info($raw = false, $use_cache = true)
 	{
@@ -71,8 +71,8 @@ class mssql extends \phpbb\db\driver\driver
 			$row = false;
 			if ($result_id)
 			{
-				$row = @mssql_fetch_assoc($result_id);
-				@mssql_free_result($result_id);
+				$row = mssql_fetch_assoc($result_id);
+				mssql_free_result($result_id);
 			}
 
 			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
@@ -124,13 +124,7 @@ class mssql extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
+	* {@inheritDoc}
 	*/
 	function sql_query($query = '', $cache_ttl = 0)
 	{
@@ -143,6 +137,10 @@ class mssql extends \phpbb\db\driver\driver
 			{
 				$this->sql_report('start', $query);
 			}
+			else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+			{
+				$this->curtime = microtime(true);
+			}
 
 			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
@@ -158,13 +156,22 @@ class mssql extends \phpbb\db\driver\driver
 				{
 					$this->sql_report('stop', $query);
 				}
+				else if (defined('PHPBB_DISPLAY_LOAD_TIME'))
+				{
+					$this->sql_time += microtime(true) - $this->curtime;
+				}
+
+				if (!$this->query_result)
+				{
+					return false;
+				}
 
 				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result !== true)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
@@ -215,7 +222,7 @@ class mssql extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Return number of affected rows
+	* {@inheritDoc}
 	*/
 	function sql_affectedrows()
 	{
@@ -223,7 +230,7 @@ class mssql extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Fetch current row
+	* {@inheritDoc}
 	*/
 	function sql_fetchrow($query_id = false)
 	{
@@ -239,12 +246,12 @@ class mssql extends \phpbb\db\driver\driver
 			return $cache->sql_fetchrow($query_id);
 		}
 
-		if ($query_id === false)
+		if (!$query_id || $query_id === true)
 		{
 			return false;
 		}
 
-		$row = @mssql_fetch_assoc($query_id);
+		$row = mssql_fetch_assoc($query_id);
 
 		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
 		if ($row)
@@ -259,8 +266,7 @@ class mssql extends \phpbb\db\driver\driver
 	}
 
 	/**
-	* Seek to given row number
-	* rownum is zero-based
+	* {@inheritDoc}
 	*/
 	function sql_rowseek($rownum, &$query_id)
 	{
@@ -271,35 +277,40 @@ class mssql extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
+		if ($query_id === true)
+		{
+			return false;
+		}
+
 		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
 
-		return ($query_id !== false) ? @mssql_data_seek($query_id, $rownum) : false;
+		return ($query_id) ? @mssql_data_seek($query_id, $rownum) : false;
 	}
 
 	/**
-	* Get last inserted id after insert statement
+	* {@inheritDoc}
 	*/
 	function sql_nextid()
 	{
 		$result_id = @mssql_query('SELECT SCOPE_IDENTITY()', $this->db_connect_id);
 		if ($result_id)
 		{
-			if ($row = @mssql_fetch_assoc($result_id))
+			if ($row = mssql_fetch_assoc($result_id))
 			{
-				@mssql_free_result($result_id);
+				mssql_free_result($result_id);
 				return $row['computed'];
 			}
-			@mssql_free_result($result_id);
+			mssql_free_result($result_id);
 		}
 
 		return false;
 	}
 
 	/**
-	* Free sql result
+	* {@inheritDoc}
 	*/
 	function sql_freeresult($query_id = false)
 	{
@@ -310,6 +321,11 @@ class mssql extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
+		if ($query_id === true)
+		{
+			return false;
+		}
+
 		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
@@ -318,14 +334,14 @@ class mssql extends \phpbb\db\driver\driver
 		if (isset($this->open_queries[(int) $query_id]))
 		{
 			unset($this->open_queries[(int) $query_id]);
-			return @mssql_free_result($query_id);
+			return mssql_free_result($query_id);
 		}
 
 		return false;
 	}
 
 	/**
-	* Escape string used in sql query
+	* {@inheritDoc}
 	*/
 	function sql_escape($msg)
 	{
@@ -350,6 +366,15 @@ class mssql extends \phpbb\db\driver\driver
 	}
 
 	/**
+	* Build NOT LIKE expression
+	* @access private
+	*/
+	function _sql_not_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	/**
 	* return sql error array
 	* @access private
 	*/
@@ -366,9 +391,9 @@ class mssql extends \phpbb\db\driver\driver
 			$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
 			if ($result_id)
 			{
-				$row = @mssql_fetch_assoc($result_id);
+				$row = mssql_fetch_assoc($result_id);
 				$error['code'] = $row['code'];
-				@mssql_free_result($result_id);
+				mssql_free_result($result_id);
 			}
 
 			// Get full error message if possible
@@ -379,12 +404,12 @@ class mssql extends \phpbb\db\driver\driver
 
 			if ($result_id)
 			{
-				$row = @mssql_fetch_assoc($result_id);
+				$row = mssql_fetch_assoc($result_id);
 				if (!empty($row['message']))
 				{
 					$error['message'] .= '<br />' . $row['message'];
 				}
-				@mssql_free_result($result_id);
+				mssql_free_result($result_id);
 			}
 		}
 		else
@@ -430,13 +455,13 @@ class mssql extends \phpbb\db\driver\driver
 				if ($result = @mssql_query($query, $this->db_connect_id))
 				{
 					@mssql_next_result($result);
-					while ($row = @mssql_fetch_row($result))
+					while ($row = mssql_fetch_row($result))
 					{
 						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
 					}
 				}
 				@mssql_query('SET SHOWPLAN_TEXT OFF;', $this->db_connect_id);
-				@mssql_free_result($result);
+				mssql_free_result($result);
 
 				if ($html_table)
 				{
@@ -449,11 +474,14 @@ class mssql extends \phpbb\db\driver\driver
 				$endtime = $endtime[0] + $endtime[1];
 
 				$result = @mssql_query($query, $this->db_connect_id);
-				while ($void = @mssql_fetch_assoc($result))
+				if ($result)
 				{
-					// Take the time spent on parsing rows into account
+					while ($void = mssql_fetch_assoc($result))
+					{
+						// Take the time spent on parsing rows into account
+					}
+					mssql_free_result($result);
 				}
-				@mssql_free_result($result);
 
 				$splittime = explode(' ', microtime());
 				$splittime = $splittime[0] + $splittime[1];