From e733831857ec3eb49bbc818b12bd7b792e65cbd6 Mon Sep 17 00:00:00 2001
From: Kazuki Przyborowski <kazuki.przyborowski@gmail.com>
Date: Thu, 17 Dec 2009 00:01:06 +0000
Subject: [PATCH] Small update to check if you can install iDB.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@413 2b68903e-0b30-0410-9a39-a2e4f3c5be39
---
 inc/versioninfo.php |  4 ++--
 setup/presetup.php  | 10 +++++++++-
 setup/setup.php     |  9 +++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index e594a98..d9abd95 100644
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 12/16/2009 SVN 412 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/16/2009 SVN 413 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
 	return $return_var; }
 // Version number and date stuff. :P
 $VER1[0] = 0; $VER1[1] = 3; $VER1[2] = 5; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 412; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 413; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 12; $SVNDay[1] = 16; $SVNDay[2] = 2009; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $VerInfo['iDB_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,false);
 $VerInfo['iDB_Ver_SVN'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[1],$SubVerN,true);
diff --git a/setup/presetup.php b/setup/presetup.php
index 2141627..90e6e6c 100644
--- a/setup/presetup.php
+++ b/setup/presetup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: presetup.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
+    $FileInfo: presetup.php - Last Update: 12/16/2009 SVN 413 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="presetup.php"||$File3Name=="/presetup.php") {
@@ -44,10 +44,18 @@ if($Error!="Yes") {
 </tr><tr>
 	<td style="width: 50%;"><label class="TextBoxLabel" for="DatabaseType">Select Database Type:</label></td>
 	<td style="width: 50%;"><select size="1" class="TextBox" name="DatabaseType" id="DatabaseType">
+	<?php if(function_exists("mysql_connect")) { ?>
 	<option value="mysql">MySQL Database</option>
+	<?php } if(function_exists("mysqli_connect")) { ?>
 	<option value="mysqli">MySQLi Database</option>
+	<?php } if(function_exists("pg_connect")) { ?>
 	<option value="pgsql">PostgreSQL Database</option>
+	<?php } if(function_exists("sqlite_open")) { ?>
 	<option value="sqlite">SQLite Database</option>
+	<?php } if(!function_exists("mysql_connect")&&!function_exists("mysqli_connect")&&
+	!function_exists("pg_connect")&&!function_exists("sqlite_open")) { ?>
+	<option value="none">No Database Available</option>
+	<?php } ?>
 	</select></td>
 </tr><tr>
 	<td style="width: 50%;"><label class="TextBoxLabel" for="charset">Select html charset:</label></td>
diff --git a/setup/setup.php b/setup/setup.php
index 0f6160b..ec5b3e2 100644
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 12/10/2009 SVN 390 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 12/16/2009 SVN 413 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -30,10 +30,15 @@ if (!is_writable($checkfile)) {
    chmod("settings.php",0755); $Error="Yes";
    chmod("settingsbak.php",0755);
 } else { /* settings.php is writable install iDB. ^_^ */ }
+if(!function_exists("mysql_connect")&&!function_exists("mysqli_connect")&&
+!function_exists("pg_connect")&&!function_exists("sqlite_open")) { $Error="Yes";
+echo "<span class=\"TableMessage\">You need to enbale a database php extension to install ".$VerInfo['iDB_Ver_Show']." on this server.<br />\n"; 
+echo "You can use MySQL, MySQLi, PostgreSQL, or SQLite</span>"; }
+if ($Error!="Yes") {
 $StatSQL = sql_connect_db($_POST['DatabaseHost'],$_POST['DatabaseUserName'],$_POST['DatabasePassword']);
 if(!$StatSQL) { $Error="Yes";
 echo "<span class=\"TableMessage\">";
-echo "<br />".sql_errorno($StatSQL)."\n</span>\n"; }
+echo "<br />".sql_errorno($StatSQL)."\n</span>\n"; } }
 if ($Error!="Yes") {
 $pretext = "<?php\n/*\n    This program is free software; you can redistribute it and/or modify\n    it under the terms of the Revised BSD License.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    Revised BSD License for more details.\n\n    Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/\n    Copyright 2004-2007 Game Maker 2k - http://idb.berlios.de/support/category.php?act=view&id=2\n    Emoticons made by Jcink http://tfbb.jcink.com/\n*/\n";
 $BoardSettings=$pretext."\$Settings = array();\n\$Settings['sqlhost'] = '".$_POST['DatabaseHost']."';\n\$Settings['sqluser'] = '".$_POST['DatabaseUserName']."';\n\$Settings['sqlpass'] = '".$_POST['DatabasePassword']."';\n?>";
-- 
2.11.0