From b02a8a2a1755de18bd3130dbba8909c8cd789bbe Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Tue, 1 Jul 2003 01:54:27 +0000
Subject: [PATCH] SQLite support ... Probably helps if the installer supports
 it I guess ... I'm having one of those lifes, please excuse me.

git-svn-id: file:///svn/phpbb/trunk@4188 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/install.php        | 20 ++++++++++++++------
 phpBB/language/en/lang_admin.php |  9 +++++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index 5582a3af20..78d2c9b776 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -25,6 +25,7 @@ define('IN_PHPBB', true);
 //error_reporting  (E_ERROR | E_WARNING | E_PARSE);
 set_magic_quotes_runtime(0);
 
+@set_time_limit(120);
 
 // Include essential scripts
 $phpbb_root_path = './../';
@@ -53,11 +54,11 @@ $cache = new acm();
 // Try opening config file
 if (@file_exists($phpbb_root_path . 'config.'.$phpEx))
 {
-	include($phpbb_root_path . 'config.'.$phpEx);
+//	include($phpbb_root_path . 'config.'.$phpEx);
 
 	if (defined('PHPBB_INSTALLED'))
 	{
-		redirect("../index.$phpEx");
+//		redirect("../index.$phpEx");
 	}
 }
 
@@ -93,16 +94,16 @@ $available_dbms = array(
 		'COMMENTS'		=> 'remove_remarks'
 	),
 	'mysql'		=> array(
-		'LABEL'			=> 'MySQL 3.x',
+		'LABEL'			=> 'MySQL',
 		'SCHEMA'		=> 'mysql',
 		'MODULE'		=> 'mysql', 
 		'DELIM'			=> ';',
 		'COMMENTS'		=> 'remove_remarks'
 	),
 	'mysql4'	=> array(
-		'LABEL'			=> 'MySQL 4.x',
+		'LABEL'			=> 'MySQL 4.1.x',
 		'SCHEMA'		=> 'mysql',
-		'MODULE'		=> 'mysql', 
+		'MODULE'		=> 'mysqli', 
 		'DELIM'			=> ';',
 		'COMMENTS'		=> 'remove_remarks'
 	),
@@ -141,6 +142,13 @@ $available_dbms = array(
 		'DELIM'			=> ';',
 		'COMMENTS'		=> 'remove_comments'
 	),
+	'sqlite'		=> array(
+		'LABEL'			=> 'SQLite',
+		'SCHEMA'		=> 'sqlite',
+		'MODULE'		=> 'sqlite', 
+		'DELIM'			=> ';',
+		'COMMENTS'		=> 'remove_remarks'
+	),
 );
 
 $suffix = ((defined('PHP_OS')) && (preg_match('#win#i', PHP_OS))) ? 'dll' : 'so';
@@ -405,7 +413,7 @@ if ($stage == 0)
 
 		foreach ($locations as $location)
 		{
-			if (file_exists($location . 'convert' . $exe) && is_executable($location . 'convert' . $exe))
+			if (file_exists($location . 'convert' . $exe) && is_readable($location . 'convert' . $exe))
 			{
 				$img_imagick = str_replace('\\', '/', $location);
 				continue;
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 889b37ab96..180a4c6460 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -70,10 +70,10 @@ $lang = array_merge($lang, array(
 	'WORD_CENSOR'	=> 'Word Censors',
 
 	'STYLE_CAT'		=> 'Styles',
-	'EDIT_STYLE'	=> 'Edit style', 
-	'EDIT_TEMPLATE'	=> 'Edit template', 
-	'EDIT_THEME'	=> 'Edit theme', 
-	'EDIT_IMAGESET'	=> 'Edit imageset', 
+	'EDIT_STYLE'	=> 'Styles', 
+	'EDIT_TEMPLATE'	=> 'Templates', 
+	'EDIT_THEME'	=> 'Themes', 
+	'EDIT_IMAGESET'	=> 'Imagesets', 
 
 	'USER_CAT'		=> 'Users', 
 	'BAN_EMAILS'	=> 'Ban Emails',
@@ -1088,6 +1088,7 @@ $lang = array_merge($lang, array(
 	'DLL_MSACCESS'		=> 'MS Access via ODBC', 
 	'DLL_ORACLE'		=> 'Oracle',
 	'DLL_POSTGRES'		=> 'PostgreSQL 7.x', 
+	'DLL_SQLITE'		=> 'SQLite', 
 	'DLL_MBSTRING'		=> 'Multi-byte character support', 
 	'DLL_ZLIB'			=> 'zlib Compression support', 
 	'DLL_FTP'			=> 'Remote FTP support',