From 76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Mon, 14 Oct 2013 16:37:23 -0500
Subject: [ticket/11918] Make sql_freeresult() consistent across all DB drivers

PHPBB3-11918
---
 phpBB/phpbb/db/driver/firebird.php    | 2 +-
 phpBB/phpbb/db/driver/mssql.php       | 6 +++---
 phpBB/phpbb/db/driver/mssql_odbc.php  | 2 +-
 phpBB/phpbb/db/driver/mssqlnative.php | 3 ++-
 phpBB/phpbb/db/driver/mysql.php       | 2 +-
 phpBB/phpbb/db/driver/oracle.php      | 2 +-
 phpBB/phpbb/db/driver/postgres.php    | 2 +-
 phpBB/phpbb/db/driver/sqlite.php      | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'phpBB/phpbb/db/driver')

diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php
index 2df5eaf369..aef75eab15 100644
--- a/phpBB/phpbb/db/driver/firebird.php
+++ b/phpBB/phpbb/db/driver/firebird.php
@@ -398,7 +398,7 @@ class firebird extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index 4d2cd287da..50096deded 100644
--- a/phpBB/phpbb/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
@@ -318,14 +318,14 @@ class mssql extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
 
-		if (isset($this->open_queries[$query_id]))
+		if (isset($this->open_queries[(int) $query_id]))
 		{
-			unset($this->open_queries[$query_id]);
+			unset($this->open_queries[(int) $query_id]);
 			return @mssql_free_result($query_id);
 		}
 
diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php
index 9db34a69fb..b9881035c0 100644
--- a/phpBB/phpbb/db/driver/mssql_odbc.php
+++ b/phpBB/phpbb/db/driver/mssql_odbc.php
@@ -305,7 +305,7 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index e6002fe1a3..aade311bcb 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -471,7 +471,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
@@ -481,6 +481,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 			unset($this->open_queries[(int) $query_id]);
 			return @sqlsrv_free_stmt($query_id);
 		}
+
 		return false;
 	}
 
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
index c76126763d..d215453ccb 100644
--- a/phpBB/phpbb/db/driver/mysql.php
+++ b/phpBB/phpbb/db/driver/mysql.php
@@ -289,7 +289,7 @@ class mysql extends \phpbb\db\driver\mysql_base
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index 5dfab21455..4fba654d1e 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -621,7 +621,7 @@ class oracle extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 7a98b90c73..9cbb1ecb07 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -350,7 +350,7 @@ class postgres extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php
index a548fd2618..55a33284f2 100644
--- a/phpBB/phpbb/db/driver/sqlite.php
+++ b/phpBB/phpbb/db/driver/sqlite.php
@@ -261,7 +261,7 @@ class sqlite extends \phpbb\db\driver\driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
-- 
cgit v1.2.1


From 7f58a4572eaca75aecff2da889e67ea151616011 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 28 Oct 2013 22:27:25 +0100
Subject: [ticket/11981] Fix code sniffer complaints

PHPBB3-11981
---
 phpBB/phpbb/db/driver/mssql.php       | 2 +-
 phpBB/phpbb/db/driver/mssqlnative.php | 4 ++--
 phpBB/phpbb/db/driver/mysqli.php      | 6 +++---
 phpBB/phpbb/db/driver/postgres.php    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/phpbb/db/driver')

diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index 50096deded..e1b41461e2 100644
--- a/phpBB/phpbb/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
@@ -259,7 +259,7 @@ class mssql extends \phpbb\db\driver\driver
 		{
 			foreach ($row as $key => $value)
 			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
+				$row[$key] = ($value === ' ' || $value === null) ? '' : $value;
 			}
 		}
 
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index aade311bcb..2eb625fb11 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -195,7 +195,7 @@ class result_mssqlnative
 */
 class mssqlnative extends \phpbb\db\driver\mssql_base
 {
-	var $m_insert_id = NULL;
+	var $m_insert_id = null;
 	var $last_query_text = '';
 	var $query_options = array();
 	var $connect_error = '';
@@ -427,7 +427,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 		{
 			foreach ($row as $key => $value)
 			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
+				$row[$key] = ($value === ' ' || $value === null) ? '' : $value;
 			}
 
 			// remove helper values from LIMIT queries
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 4d0e43b464..6144dba0c4 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -47,11 +47,11 @@ class mysqli extends \phpbb\db\driver\mysql_base
 		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;
 
 		$this->dbname = $database;
-		$port = (!$port) ? NULL : $port;
+		$port = (!$port) ? null : $port;
 
 		// If port is set and it is not numeric, most likely mysqli socket is set.
 		// Try to map it to the $socket parameter.
-		$socket = NULL;
+		$socket = null;
 		if ($port)
 		{
 			if (is_numeric($port))
@@ -61,7 +61,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
 			else
 			{
 				$socket = $port;
-				$port = NULL;
+				$port = null;
 			}
 		}
 
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 9cbb1ecb07..5cd6578d87 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -328,7 +328,7 @@ class postgres extends \phpbb\db\driver\driver
 					return false;
 				}
 
-				$temp_result = @pg_fetch_assoc($temp_q_id, NULL);
+				$temp_result = @pg_fetch_assoc($temp_q_id, null);
 				@pg_free_result($query_id);
 
 				return ($temp_result) ? $temp_result['last_value'] : false;
@@ -456,7 +456,7 @@ class postgres extends \phpbb\db\driver\driver
 
 					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))
 					{
-						while ($row = @pg_fetch_assoc($result, NULL))
+						while ($row = @pg_fetch_assoc($result, null))
 						{
 							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
 						}
@@ -476,7 +476,7 @@ class postgres extends \phpbb\db\driver\driver
 				$endtime = $endtime[0] + $endtime[1];
 
 				$result = @pg_query($this->db_connect_id, $query);
-				while ($void = @pg_fetch_assoc($result, NULL))
+				while ($void = @pg_fetch_assoc($result, null))
 				{
 					// Take the time spent on parsing rows into account
 				}
-- 
cgit v1.2.1


From 02e9f6e2840d7227f158b4baf96fd9c0f6207531 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 29 Oct 2013 21:31:07 +0100
Subject: [task/code-sniffer] Fix argument list spacing.

PHPBB3-11980
---
 phpBB/phpbb/db/driver/mysqli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/db/driver')

diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 6144dba0c4..aeb66c00cd 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -31,7 +31,7 @@ class mysqli extends \phpbb\db\driver\mysql_base
 	/**
 	* Connect to server
 	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
 	{
 		if (!function_exists('mysqli_connect'))
 		{
-- 
cgit v1.2.1


From 7aa8f6461f1e85cf91931f56b95384e54fec07c2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 Oct 2013 13:05:28 +0100
Subject: [task/code-sniffer] Remove the IN_PHPBB check side-effect from class
 files.

PHPBB3-11980
---
 phpBB/phpbb/db/driver/driver.php      | 8 --------
 phpBB/phpbb/db/driver/firebird.php    | 8 --------
 phpBB/phpbb/db/driver/mssql.php       | 8 --------
 phpBB/phpbb/db/driver/mssql_base.php  | 8 --------
 phpBB/phpbb/db/driver/mssql_odbc.php  | 8 --------
 phpBB/phpbb/db/driver/mssqlnative.php | 8 --------
 phpBB/phpbb/db/driver/mysql.php       | 8 --------
 phpBB/phpbb/db/driver/mysql_base.php  | 8 --------
 phpBB/phpbb/db/driver/mysqli.php      | 8 --------
 phpBB/phpbb/db/driver/oracle.php      | 8 --------
 phpBB/phpbb/db/driver/postgres.php    | 8 --------
 phpBB/phpbb/db/driver/sqlite.php      | 8 --------
 12 files changed, 96 deletions(-)

(limited to 'phpBB/phpbb/db/driver')

diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 53d39e9127..58d0b61519 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Database Abstraction Layer
 * @package dbal
diff --git a/phpBB/phpbb/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php
index aef75eab15..ed56a5d154 100644
--- a/phpBB/phpbb/db/driver/firebird.php
+++ b/phpBB/phpbb/db/driver/firebird.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Firebird/Interbase Database Abstraction Layer
 * Minimum Requirement is Firebird 2.1
diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index e1b41461e2..6ebc891673 100644
--- a/phpBB/phpbb/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * MSSQL Database Abstraction Layer
 * Minimum Requirement is MSSQL 2000+
diff --git a/phpBB/phpbb/db/driver/mssql_base.php b/phpBB/phpbb/db/driver/mssql_base.php
index 57c4e0f1fd..113f1c6902 100644
--- a/phpBB/phpbb/db/driver/mssql_base.php
+++ b/phpBB/phpbb/db/driver/mssql_base.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * MSSQL Database Base Abstraction Layer
 * @package dbal
diff --git a/phpBB/phpbb/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php
index b9881035c0..f8c70f1cd7 100644
--- a/phpBB/phpbb/db/driver/mssql_odbc.php
+++ b/phpBB/phpbb/db/driver/mssql_odbc.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Unified ODBC functions
 * Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere...
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 2eb625fb11..76cbd59d93 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -13,14 +13,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
  * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array
  * and maintain our own cursor index into that array.
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
index d215453ccb..e311f0dd74 100644
--- a/phpBB/phpbb/db/driver/mysql.php
+++ b/phpBB/phpbb/db/driver/mysql.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * MySQL4 Database Abstraction Layer
 * Compatible with:
diff --git a/phpBB/phpbb/db/driver/mysql_base.php b/phpBB/phpbb/db/driver/mysql_base.php
index 8f2f66674b..87b6d153a9 100644
--- a/phpBB/phpbb/db/driver/mysql_base.php
+++ b/phpBB/phpbb/db/driver/mysql_base.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Abstract MySQL Database Base Abstraction Layer
 * @package dbal
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index aeb66c00cd..adc8f96302 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * MySQLi Database Abstraction Layer
 * mysqli-extension has to be compiled with:
diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index 4fba654d1e..36ed43d4a7 100644
--- a/phpBB/phpbb/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Oracle Database Abstraction Layer
 * @package dbal
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 5cd6578d87..5dbd1ca74f 100644
--- a/phpBB/phpbb/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * PostgreSQL Database Abstraction Layer
 * Minimum Requirement is Version 7.3+
diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php
index 55a33284f2..59ec895c0f 100644
--- a/phpBB/phpbb/db/driver/sqlite.php
+++ b/phpBB/phpbb/db/driver/sqlite.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\db\driver;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Sqlite Database Abstraction Layer
 * Minimum Requirement: 2.8.2+
-- 
cgit v1.2.1


From ae7ef3e09dd284b8876ad74de16321c373d251af Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 Oct 2013 00:48:03 +0100
Subject: [task/code-sniffer] Remove class result_mssqlnative.

PHPBB3-11980
---
 phpBB/phpbb/db/driver/mssqlnative.php | 169 ----------------------------------
 1 file changed, 169 deletions(-)

(limited to 'phpBB/phpbb/db/driver')

diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 76cbd59d93..125db9c8d4 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -13,175 +13,6 @@
 
 namespace phpbb\db\driver;
 
-/**
- * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array
- * and maintain our own cursor index into that array.
- */
-class result_mssqlnative
-{
-	public function result_mssqlnative($queryresult = false)
-	{
-		$this->m_cursor = 0;
-		$this->m_rows = array();
-		$this->m_num_fields = sqlsrv_num_fields($queryresult);
-		$this->m_field_meta = sqlsrv_field_metadata($queryresult);
-
-		while ($row = sqlsrv_fetch_array($queryresult, SQLSRV_FETCH_ASSOC))
-		{
-			if ($row !== null)
-			{
-				foreach($row as $k => $v)
-				{
-					if (is_object($v) && method_exists($v, 'format'))
-					{
-						$row[$k] = $v->format("Y-m-d\TH:i:s\Z");
-					}
-				}
-				$this->m_rows[] = $row;//read results into memory, cursors are not supported
-			}
-		}
-
-		$this->m_row_count = sizeof($this->m_rows);
-	}
-
-	private function array_to_obj($array, &$obj)
-	{
-		foreach ($array as $key => $value)
-		{
-			if (is_array($value))
-			{
-				$obj->$key = new \stdClass();
-				array_to_obj($value, $obj->$key);
-			}
-			else
-			{
-				$obj->$key = $value;
-			}
-		}
-		return $obj;
-	}
-
-	public function fetch($mode = SQLSRV_FETCH_BOTH, $object_class = 'stdClass')
-	{
-		if ($this->m_cursor >= $this->m_row_count || $this->m_row_count == 0)
-		{
-			return false;
-		}
-
-		$ret = false;
-		$arr_num = array();
-
-		if ($mode == SQLSRV_FETCH_NUMERIC || $mode == SQLSRV_FETCH_BOTH)
-		{
-			foreach($this->m_rows[$this->m_cursor] as $key => $value)
-			{
-				$arr_num[] = $value;
-			}
-		}
-
-		switch ($mode)
-		{
-			case SQLSRV_FETCH_ASSOC:
-				$ret = $this->m_rows[$this->m_cursor];
-			break;
-			case SQLSRV_FETCH_NUMERIC:
-				$ret = $arr_num;
-			break;
-			case 'OBJECT':
-				$ret = $this->array_to_obj($this->m_rows[$this->m_cursor], $o = new $object_class);
-			break;
-			case SQLSRV_FETCH_BOTH:
-			default:
-				$ret = $this->m_rows[$this->m_cursor] + $arr_num;
-			break;
-		}
-		$this->m_cursor++;
-		return $ret;
-	}
-
-	public function get($pos, $fld)
-	{
-		return $this->m_rows[$pos][$fld];
-	}
-
-	public function num_rows()
-	{
-		return $this->m_row_count;
-	}
-
-	public function seek($iRow)
-	{
-		$this->m_cursor = min($iRow, $this->m_row_count);
-	}
-
-	public function num_fields()
-	{
-		return $this->m_num_fields;
-	}
-
-	public function field_name($nr)
-	{
-		$arr_keys = array_keys($this->m_rows[0]);
-		return $arr_keys[$nr];
-	}
-
-	public function field_type($nr)
-	{
-		$i = 0;
-		$int_type = -1;
-		$str_type = '';
-
-		foreach ($this->m_field_meta as $meta)
-		{
-			if ($nr == $i)
-			{
-				$int_type = $meta['Type'];
-				break;
-			}
-			$i++;
-		}
-
-		//http://msdn.microsoft.com/en-us/library/cc296183.aspx contains type table
-		switch ($int_type)
-		{
-			case SQLSRV_SQLTYPE_BIGINT: 		$str_type = 'bigint'; break;
-			case SQLSRV_SQLTYPE_BINARY: 		$str_type = 'binary'; break;
-			case SQLSRV_SQLTYPE_BIT: 			$str_type = 'bit'; break;
-			case SQLSRV_SQLTYPE_CHAR: 			$str_type = 'char'; break;
-			case SQLSRV_SQLTYPE_DATETIME: 		$str_type = 'datetime'; break;
-			case SQLSRV_SQLTYPE_DECIMAL/*($precision, $scale)*/: $str_type = 'decimal'; break;
-			case SQLSRV_SQLTYPE_FLOAT: 			$str_type = 'float'; break;
-			case SQLSRV_SQLTYPE_IMAGE: 			$str_type = 'image'; break;
-			case SQLSRV_SQLTYPE_INT: 			$str_type = 'int'; break;
-			case SQLSRV_SQLTYPE_MONEY: 			$str_type = 'money'; break;
-			case SQLSRV_SQLTYPE_NCHAR/*($charCount)*/: $str_type = 'nchar'; break;
-			case SQLSRV_SQLTYPE_NUMERIC/*($precision, $scale)*/: $str_type = 'numeric'; break;
-			case SQLSRV_SQLTYPE_NVARCHAR/*($charCount)*/: $str_type = 'nvarchar'; break;
-			case SQLSRV_SQLTYPE_NTEXT: 			$str_type = 'ntext'; break;
-			case SQLSRV_SQLTYPE_REAL: 			$str_type = 'real'; break;
-			case SQLSRV_SQLTYPE_SMALLDATETIME: 	$str_type = 'smalldatetime'; break;
-			case SQLSRV_SQLTYPE_SMALLINT: 		$str_type = 'smallint'; break;
-			case SQLSRV_SQLTYPE_SMALLMONEY: 	$str_type = 'smallmoney'; break;
-			case SQLSRV_SQLTYPE_TEXT: 			$str_type = 'text'; break;
-			case SQLSRV_SQLTYPE_TIMESTAMP: 		$str_type = 'timestamp'; break;
-			case SQLSRV_SQLTYPE_TINYINT: 		$str_type = 'tinyint'; break;
-			case SQLSRV_SQLTYPE_UNIQUEIDENTIFIER: $str_type = 'uniqueidentifier'; break;
-			case SQLSRV_SQLTYPE_UDT: 			$str_type = 'UDT'; break;
-			case SQLSRV_SQLTYPE_VARBINARY/*($byteCount)*/: $str_type = 'varbinary'; break;
-			case SQLSRV_SQLTYPE_VARCHAR/*($charCount)*/: $str_type = 'varchar'; break;
-			case SQLSRV_SQLTYPE_XML: 			$str_type = 'xml'; break;
-			default: $str_type = $int_type;
-		}
-		return $str_type;
-	}
-
-	public function free()
-	{
-		unset($this->m_rows);
-		return;
-	}
-}
-
 /**
 * @package dbal
 */
-- 
cgit v1.2.1


From 23e2f920f5ed52cf9b354f61fcff548a03335ecc Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 14 Nov 2013 15:55:04 +0100
Subject: [ticket/12018] Use path_helper for admin style CSS in sql report

The path to the admin style CSS is currently created with $phpbb_admin_path.
We should however use the path_helper to correctly link to this file in order
to have a correct link on pages like extensions

PHPBB3-12018
---
 phpBB/phpbb/db/driver/driver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/db/driver')

diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 58d0b61519..d721ed2eb7 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -816,7 +816,7 @@ class driver
 	*/
 	function sql_report($mode, $query = '')
 	{
-		global $cache, $starttime, $phpbb_root_path, $phpbb_admin_path, $user;
+		global $cache, $starttime, $phpbb_root_path, $phpbb_path_helper, $user;
 		global $request;
 
 		if (is_object($request) && !$request->variable('explain', false))
@@ -846,7 +846,7 @@ class driver
 					<head>
 						<meta charset="utf-8">
 						<title>SQL Report</title>
-						<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+						<link href="' . htmlspecialchars($phpbb_path_helper->update_web_root_path($phpbb_root_path) . $phpbb_path_helper->get_adm_relative_path()) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 					</head>
 					<body id="errorpage">
 					<div id="wrap">
-- 
cgit v1.2.1