From 025a95ea909d449e14cb22564983fb005e3f8c06 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 9 Mar 2011 21:50:45 -0500
Subject: [ticket/10205] Account for potentially missing extensions in dbal.

PHPBB3-10205
---
 phpBB/includes/db/mssql_odbc.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/db/mssql_odbc.php')

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 2ecc42cadf..dabdbd1a44 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -32,6 +32,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 class dbal_mssql_odbc extends dbal
 {
 	var $last_query_text = '';
+	var $connect_error = '';
 
 	/**
 	* Connect to server
@@ -68,7 +69,24 @@ class dbal_mssql_odbc extends dbal
 			@ini_set('odbc.defaultlrl', $max_size);
 		}
 
-		$this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword);
+		if ($this->persistency)
+		{
+			if (!function_exists('odbc_pconnect'))
+			{
+				$this->connect_error = 'odbc_pconnect function does not exist, is odbc extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @odbc_pconnect($this->server, $this->user, $sqlpassword);
+		}
+		else
+		{
+			if (!function_exists('odbc_connect'))
+			{
+				$this->connect_error = 'odbc_connect function does not exist, is odbc extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @odbc_connect($this->server, $this->user, $sqlpassword);
+		}
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
-- 
cgit v1.2.1


From 9f549e8249acbd82b68e961a6e0a31de47d9ca32 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:50:41 -0500
Subject: [ticket/10205] Fix remaining db drivers.

PHPBB3-10205
---
 phpBB/includes/db/mssql_odbc.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/db/mssql_odbc.php')

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index dabdbd1a44..e1234389df 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -360,10 +360,20 @@ class dbal_mssql_odbc extends dbal
 	*/
 	function _sql_error()
 	{
-		return array(
-			'message'	=> @odbc_errormsg(),
-			'code'		=> @odbc_error()
-		);
+		if (function_exists('odbc_errormsg'))
+		{
+			return array(
+				'message'	=> @odbc_errormsg(),
+				'code'		=> @odbc_error()
+			);
+		}
+		else
+		{
+			return array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


From 89c9c9d4b0daa7308fd015e8a6fca6386a8b8016 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:22:33 -0500
Subject: [ticket/10205] Cosmetic changes.

PHPBB3-10205
---
 phpBB/includes/db/mssql_odbc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/db/mssql_odbc.php')

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index e1234389df..47792d74ab 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -364,7 +364,7 @@ class dbal_mssql_odbc extends dbal
 		{
 			return array(
 				'message'	=> @odbc_errormsg(),
-				'code'		=> @odbc_error()
+				'code'		=> @odbc_error(),
 			);
 		}
 		else
-- 
cgit v1.2.1


From 597dea1e047b94f0a862f7f6e650771ffc780141 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:32:02 -0500
Subject: [ticket/10205] Rewrite _sql_error implementations to have a single
 return.

PHPBB3-10205
---
 phpBB/includes/db/mssql_odbc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/db/mssql_odbc.php')

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 47792d74ab..04501cce8b 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -362,18 +362,20 @@ class dbal_mssql_odbc extends dbal
 	{
 		if (function_exists('odbc_errormsg'))
 		{
-			return array(
+			$error = array(
 				'message'	=> @odbc_errormsg(),
 				'code'		=> @odbc_error(),
 			);
 		}
 		else
 		{
-			return array(
+			$error = array(
 				'message'	=> $this->connect_error,
 				'code'		=> '',
 			);
 		}
+
+		return $error;
 	}
 
 	/**
-- 
cgit v1.2.1