From f9f10be464369053a505b5c4c1de9e29f38247b2 Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sun, 18 Jun 2006 11:55:45 +0000
Subject: [PATCH] Misc installation bugs

git-svn-id: file:///svn/phpbb/trunk@6095 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/index.php           | 6 ++----
 phpBB/install/install_install.php | 9 ++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index b2e36cd047..87766d03d4 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -332,7 +332,7 @@ class module
 	*/
 	function page_footer()
 	{
-		global $template;
+		global $db, $template;
 
 		$template->display('body');
 	
@@ -545,9 +545,7 @@ class module
 			'MESSAGE_TEXT'		=> '<p>' . basename($file) . ' [ ' . $line . ' ]</p><p>SQL : ' . $sql . '</p><p><b>' . $error . '</b></p>',
 		));
 
-		$db->sql_close();
 		$this->page_footer();
-		exit;
 	}
 
 	/**
@@ -573,7 +571,7 @@ class module
 				$rows = (int) $tpl_type[1];
 				$cols = (int) $tpl_type[2];
 
-				$tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $value . '</textarea>';
+				$tpl = '<textarea id="' . $name . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $value . '</textarea>';
 			break;
 
 			case 'radio':
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index bdd718ab1a..1e525bc179 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -836,8 +836,8 @@ class install_install extends module
 
 		$server_name = ($server_name !== '') ? $server_name : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
 		$server_port = ($server_port !== '') ? $server_port : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'));
-		$server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS']) ? 'https://' : 'http://');
-		$cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS']) ? true : false);
+		$server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS'] && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://');
+		$cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS'] && $_SERVER['HTTPS'] == 'on') ? true : false);
 
 		
 		foreach ($this->advanced_config_options as $config_key => $vars)
@@ -1315,9 +1315,8 @@ class install_install extends module
 						$sql = 'SELECT * FROM ' . MODULES_TABLE . " 
 							WHERE module_langname = '$mod_name'
 								AND module_class = '$module_class'
-								AND module_name <> ''
-							LIMIT 1";
-						$result = $db->sql_query($sql);
+								AND module_name <> ''";
+						$result = $db->sql_query_limit($sql, 1);
 						$module_data = $db->sql_fetchrow($result);
 						$db->sql_freeresult($result);