Added support for MySQL Improved Extension.

git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@398 2b68903e-0b30-0410-9a39-a2e4f3c5be39

diff --git a/inc/events.php b/inc/events.php
index bbd7358..e1d3555 100644 (file)
--- a/inc/events.php
+++ b/inc/events.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: events.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: events.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="events.php"||$File3Name=="/events.php") {
@@ -634,7 +634,8 @@ $EventDay=GMTimeChange("d",$TimeSIn,0,0,"off");
 $EventDayEnd=GMTimeChange("d",$TimeSOut,0,0,"off");
 $EventYear=GMTimeChange("Y",$TimeSIn,0,0,"off");
 $EventYearEnd=GMTimeChange("Y",$TimeSOut,0,0,"off");
-if($Settings['sqltype']=="mysql") {
+if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli") {
 $eventid = sql_get_next_id($Settings['sqltable'],"events",$SQLStat); }
 $User1ID=$MyUserID;
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }

diff --git a/inc/members.php b/inc/members.php
index 079d71e..053b621 100644 (file)
--- a/inc/members.php
+++ b/inc/members.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: members.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -1345,7 +1345,8 @@ $gquerys = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."groups\" WHER
 $gresults=sql_query($gquerys,$SQLStat);
 $yourgroup=sql_result($gresults,0,"id");
 sql_free_result($gresults);
-if($Settings['sqltype']=="mysql") {
+if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli") {
 $yourid = sql_get_next_id($Settings['sqltable'],"members",$SQLStat); }
 $_POST['Interests'] = remove_spaces($_POST['Interests']);
 $_POST['Title'] = remove_spaces($_POST['Title']);

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index 3f10e49..6402de7 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: functions.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -32,6 +32,8 @@ CheckFile("functions.php");
 require($SettDir['misc']."compression.php");
 if($Settings['sqltype']=="mysql") {
 require($SettDir['misc']."mysql.php"); }
+if($Settings['sqltype']=="mysqli") {
+require($SettDir['misc']."mysqli.php"); }
 if($Settings['sqltype']=="pgsql") {
 require($SettDir['misc']."pgsql.php"); }
 if($Settings['sqltype']=="sqlite") {

diff --git a/inc/misc/mysqli.php b/inc/misc/mysqli.php
new file mode 100644 (file)
index 0000000..1d19771
--- /dev/null
+++ b/inc/misc/mysqli.php
@@ -0,0 +1,210 @@
+<?php
+/*
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Revised BSD License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Revised BSD License for more details.
+
+    Copyright 2004-2009 iDB Support - http://idb.berlios.de/
+    Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
+
+    $FileInfo: mysqli.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
+*/
+$File3Name = basename($_SERVER['SCRIPT_NAME']);
+if ($File3Name=="mysql.php"||$File3Name=="/mysql.php") {
+       @header('Location: index.php');
+       exit(); }
+// MySQL Functions.
+function sql_error($link=null) {
+if(isset($link)) {
+       $result = mysqli_error($link); }
+if(!isset($link)) {
+       $result = mysqli_error(); }
+if ($result=="") {
+       return ""; }
+       return $result; }
+function sql_errno($link=null) {
+if(isset($link)) {
+       $result = mysqli_errno($link); }
+if(!isset($link)) {
+       $result = mysqli_errno(); }
+if ($result===0) {
+       return 0; }
+       return $result; }
+function sql_errorno($link=null) {
+if(isset($link)) {
+       $result = sql_error($link);
+       $resultno = sql_errno($link); }
+if(!isset($link)) {
+       $result = sql_error();
+       $resultno = sql_errno(); }
+if ($result==""&&$result===0) {
+       return ""; }
+if ($result!=""&&$result!==0) {
+       $result = $resultno.": ".$result; }
+       return $result; }
+// Execute a query :P
+$NumQueries = 0;
+function sql_query($query,$link=null) {
+global $NumQueries;
+if(isset($link)) {
+       $result = mysqli_query($link,$query); }
+if(!isset($link)) {
+       $result = mysqli_query(null,$query); }
+if ($result===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+if ($result!==false) {
+       ++$NumQueries;
+       return $result; } }
+//Fetch Number of Rows
+function sql_num_rows($result) {
+$num = mysqli_num_rows($result);
+if ($num===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+       return $num; }
+// Connect to mysql database
+function sql_connect_db($server,$username,$password,$database=null,$new_link=false) {
+$myport = "3306";
+$hostex = explode(":", $server);
+if(isset($hostex[1])&&
+       !is_numeric($hostex[1])) {
+       $hostex[1] = $myport; }
+if(isset($hostex[1])) { 
+       $server = $hostex[0];
+       $myport = $hostex[1]; }
+if($database===null) {
+$link = mysqli_connect($server,$username,$password,null,$myport); }
+if($database!==null) {
+$link = mysqli_connect($server,$username,$password,$database,$myport); }
+if ($link===false) {
+    output_error("Not connected: ".sql_error(),E_USER_ERROR);
+       return false; }
+$result = sql_query("SET SESSION SQL_MODE='ANSI_QUOTES';",$link);
+if ($result===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+return $link; }
+// Query Results :P
+function sql_result($result,$row,$field=0) {
+mysqli_data_seek($result,$row);
+$trow = mysqli_fetch_array($result);
+$retval = $trow[$field]; 
+return $retval; }
+// Free Results :P
+function sql_free_result($result) {
+$fresult = mysqli_free_result($result);
+if ($fresult===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+if ($fresult===true) {
+       return true; } }
+//Fetch Results to Array
+function sql_fetch_array($result,$result_type=MYSQLI_BOTH) {
+$row = mysqli_fetch_array($result,$result_type);
+       return $row; }
+//Fetch Results to Associative Array
+function sql_fetch_assoc($result) {
+$row = mysqli_fetch_assoc($result);
+       return $row; }
+//Fetch Row Results
+function sql_fetch_row($result) {
+$row = mysqli_fetch_row($result);
+       return $row; }
+//Fetch Row Results
+function sql_server_info($link=null) {
+if(isset($link)) {
+       $result = mysqli_get_server_info($link); }
+if(!isset($link)) {
+       $result = mysqli_get_server_info(); }
+       return $result; }
+function sql_escape_string($string,$link=null) {
+global $SQLStat;
+if(isset($link)) {
+       $string = mysqli_real_escape_string($link,$string); }
+if(!isset($link)) {
+       $string = mysqli_real_escape_string($SQLStat,$string); }
+if ($string===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+       return $string; }
+// SafeSQL Lite Source Code by Cool Dude 2k
+// Make SQL Query's safe
+function sql_pre_query($query_string,$query_vars) {
+   $query_array = array(array("%i","%I","%F","%S"),array("%d","%d","%f","%s"));
+   $query_string = str_replace($query_array[0], $query_array[1], $query_string);
+   if (get_magic_quotes_gpc()) {
+       $query_vars  = array_map("stripslashes", $query_vars); }
+   $query_vars = array_map("sql_escape_string", $query_vars);
+   $query_val = $query_vars;
+$query_num = count($query_val);
+$query_i = 0;
+while ($query_i < $query_num) {
+$query_is = $query_i+1;
+$query_val[$query_is] = $query_vars[$query_i];
+++$query_i; }
+   $query_val[0] = $query_string;
+   return call_user_func_array("sprintf",$query_val); }
+function sql_set_charset($charset,$link=null) {
+if(function_exists('mysqli_set_charset')===false) {
+if(!isset($link)) {
+       $result = sql_query("SET CHARACTER SET '".$charset."'"); }
+if(isset($link)) {
+       $result = sql_query("SET CHARACTER SET '".$charset."'",$link); }
+if ($result===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+if(!isset($link)) {
+       $result = sql_query("SET NAMES '".$charset."'"); }
+if(isset($link)) {
+       $result = sql_query("SET NAMES '".$charset."'",$link); } 
+if ($result===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+       return true; }
+if(function_exists('mysqli_set_charset')===true) {
+if(isset($link)) {
+       $result = mysqli_set_charset($link,$charset); }
+if(!isset($link)) {
+       $result = mysqli_set_charset(null,$charset); }
+if ($result===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+       return true; } }
+/*
+if(function_exists('mysqli_set_charset')===false) {
+function mysqli_set_charset($charset,$link) {
+if(isset($link)) {
+       $result = sql_set_charset($charset,$link); }
+if(!isset($link)) {
+       $result = sql_set_charset($charset); }
+if ($result===false) {
+    output_error("SQL Error: ".sql_error(),E_USER_ERROR);
+       return false; }
+       return true; } }
+*/
+// Get next id for stuff
+function sql_get_next_id($tablepre,$table,$link=null) {
+   $getnextidq = sql_pre_query("SHOW TABLE STATUS LIKE '".$tablepre.$table."'", array());
+if(!isset($link)) {
+       $result = sql_query($getnextidq); }
+if(isset($link)) {
+       $getnextidr = sql_query($getnextidq,$link); } 
+   $getnextid = sql_fetch_assoc($getnextidr);
+   return $getnextid['Auto_increment'];
+   @sql_free_result($getnextidr); }
+// Get number of rows for table
+function sql_get_num_rows($tablepre,$table,$link=null) {
+   $getnextidq = sql_pre_query("SHOW TABLE STATUS LIKE '".$tablepre.$table."'", array());
+if(!isset($link)) {
+       $getnextidr = sql_query($getnextidq); }
+if(isset($link)) {
+       $getnextidr = sql_query($getnextidq,$link); } 
+   $getnextid = sql_fetch_assoc($getnextidr);
+   return $getnextid['Rows'];
+   @sql_free_result($getnextidr); }
+?>

diff --git a/inc/misc/setcheck.php b/inc/misc/setcheck.php
index 7d2f273..79a3183 100644 (file)
--- a/inc/misc/setcheck.php
+++ b/inc/misc/setcheck.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: setcheck.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: setcheck.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setcheck.php"||$File3Name=="/setcheck.php") {
@@ -30,10 +30,12 @@ if(!isset($Settings['sqltype'])) {
        $Settings['sqltype'] = "mysql"; }
 $Settings['sqltype'] = strtolower($Settings['sqltype']);
 if($Settings['sqltype']!="mysql"&&
+       $Settings['sqltype']!="mysqli"&&
        $Settings['sqltype']!="pgsql"&&
        $Settings['sqltype']!="sqlite") {
        $Settings['sqltype'] = "mysql"; }
 if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli"||
        $Settings['sqltype']=="sqlite") {
        $SQLimit = "LIMIT %i,%i"; }
 if($Settings['sqltype']=="pgsql") {

diff --git a/inc/pm.php b/inc/pm.php
index 846adad..4b8b3f7 100644 (file)
--- a/inc/pm.php
+++ b/inc/pm.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: pm.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: pm.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="pm.php"||$File3Name=="/pm.php") {
@@ -966,7 +966,8 @@ redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"ac
        </span><br /></td>
 </tr>
 <?php } if ($Error!="Yes") { $LastActive = GMTimeStamp();
-if($Settings['sqltype']=="mysql") {
+if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli") {
 $messageid = sql_get_next_id($Settings['sqltable'],"messenger",$SQLStat); }
 if($_SESSION['UserGroup']==$Settings['GuestGroup']) { $User1Name = $_POST['GuestName']; }
 if($_SESSION['UserGroup']!=$Settings['GuestGroup']) { $User1Name = $_SESSION['MemberName']; }

diff --git a/inc/replies.php b/inc/replies.php
index 7f3f37c..905bd54 100644 (file)
--- a/inc/replies.php
+++ b/inc/replies.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: replies.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: replies.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="replies.php"||$File3Name=="/replies.php") {
@@ -843,7 +843,8 @@ $gnrresult=sql_query($gnrquery,$SQLStat); $gnrnum=sql_num_rows($gnrresult);
 $NumberPosts=sql_result($gnrresult,0,"NumPosts"); 
 $PostCountAdd=sql_result($gnrresult,0,"PostCountAdd"); 
 sql_free_result($gnrresult);
-if($Settings['sqltype']=="mysql") {
+if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli") {
 $postid = sql_get_next_id($Settings['sqltable'],"posts",$SQLStat); }
 $requery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"id\"=%i LIMIT 1", array($MyUsersID));
 $reresult=sql_query($requery,$SQLStat);

diff --git a/inc/topics.php b/inc/topics.php
index 5a49f59..a356274 100644 (file)
--- a/inc/topics.php
+++ b/inc/topics.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: topics.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: topics.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="topics.php"||$File3Name=="/topics.php") {
@@ -831,7 +831,8 @@ redirect("refresh",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"ac
        </span><br /></td>
 </tr>
 <?php } if ($Error!="Yes") { $LastActive = GMTimeStamp();
-if($Settings['sqltype']=="mysql") {
+if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli") {
 $topicid = sql_get_next_id($Settings['sqltable'],"topics",$SQLStat);
 /*$postid = sql_get_next_id($Settings['sqltable'],"posts",$SQLStat);*/ }
 $requery = sql_pre_query("SELECT * FROM \"".$Settings['sqltable']."members\" WHERE \"id\"=%i LIMIT 1", array($MyUserID));
@@ -864,7 +865,8 @@ $topicid = sql_get_next_id($Settings['sqltable'],"topics",$SQLStat); }
 $query = sql_pre_query("INSERT INTO \"".$Settings['sqltable']."posts\" (\"TopicID\", \"ForumID\", \"CategoryID\", \"UserID\", \"GuestName\", \"TimeStamp\", \"LastUpdate\", \"EditUser\", \"EditUserName\", \"Post\", \"Description\", \"IP\", \"EditIP\") VALUES\n".
 "(".$topicid.", %i, %i, %i, '%s', %i, %i, 0, '', '%s', '%s', '%s', '0')", array($ForumID,$ForumCatID,$User1ID,$User1Name,$LastActive,$LastActive,$_POST['TopicPost'],$_POST['TopicDesc'],$User1IP));
 sql_query($query,$SQLStat);
-if($Settings['sqltype']=="pgsql") {
+if($Settings['sqltype']=="pgsql"||
+       $Settings['sqltype']=="sqlite") {
 /*$postid = sql_get_next_id($Settings['sqltable'],"posts",$SQLStat);*/ }
 $_SESSION['LastPostTime'] = GMTimeStamp() + $GroupInfo['FloodControl'];
 if($User1ID!=0&&$User1ID!=-1) {

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 37ab4a6..de824fc 100644 (file)
--- 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/12/2009 SVN 397 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/12/2009 SVN 398 - 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] = 4; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 397; $RName = "iDB"; $SFName = "IntDB";
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 398; $RName = "iDB"; $SFName = "IntDB";
 $SVNDay[0] = 12; $SVNDay[1] = 12; $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/mkconfig.php b/setup/mkconfig.php
index 677c00e..02abb97 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.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: mkconfig.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -164,7 +164,8 @@ if($csrand==3) { $gpass .= chr(rand(97,122)); }
 ++$i; } $GuestPassword = b64e_hmac($gpass,$YourDate,$GSalt,$_POST['usehashtype']);
 $url_this_dir = "http://".$_SERVER['HTTP_HOST'].$this_dir."index.php?act=view";
 $YourIP = $_SERVER['REMOTE_ADDR'];
-if($Settings['sqltype']=="mysql") {
+if($Settings['sqltype']=="mysql"||
+       $Settings['sqltype']=="mysqli") {
 require($SetupDir['setup'].'mysql.php'); }
 if($Settings['sqltype']=="pgsql") {
 require($SetupDir['setup'].'pgsql.php'); }

diff --git a/setup/preinstall.php b/setup/preinstall.php
index db5f904..476dfe9 100644 (file)
--- a/setup/preinstall.php
+++ b/setup/preinstall.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: preinstall.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: preinstall.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 error_reporting(E_ALL ^ E_NOTICE);
 /* Some ini setting changes uncomment if you need them. */
@@ -37,6 +37,7 @@ if(isset($_POST['DatabaseType'])) {
        $Settings['sqltype'] = $_POST['DatabaseType']; }
 if(isset($Settings['sqltype'])) {
 if($Settings['sqltype']!="mysql"&&
+       $Settings['sqltype']!="mysqli"&&
        $Settings['sqltype']!="pgsql"&&
        $Settings['sqltype']!="sqlite") {
        $Settings['sqltype'] = "mysql"; } }

diff --git a/setup/presetup.php b/setup/presetup.php
index 5934405..2141627 100644 (file)
--- 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/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: presetup.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="presetup.php"||$File3Name=="/presetup.php") {
@@ -44,9 +44,10 @@ 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">
-       <option value="mysql">MySQL Databse</option>
-       <option value="pgsql">PostgreSQL Databse</option>
-       <option value="sqlite">SQLite Databse</option>
+       <option value="mysql">MySQL Database</option>
+       <option value="mysqli">MySQLi Database</option>
+       <option value="pgsql">PostgreSQL Database</option>
+       <option value="sqlite">SQLite Database</option>
        </select></td>
 </tr><tr>
        <td style="width: 50%;"><label class="TextBoxLabel" for="charset">Select html charset:</label></td>

diff --git a/sql.php b/sql.php
index a4ac253..0b12e4b 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2009 iDB Support - http://idb.berlios.de/
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 12/12/2009 SVN 398 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -224,7 +224,8 @@ $SQLSType = $Settings['sqltype'];
 function sqlsession_write($id,$data) {
 global $sqltable,$SQLStat,$SQLSType;
 $time = GMTimeStamp();
-if($SQLSType=="mysql") {
+if($SQLSType=="mysql"||
+       $SQLSType=="mysqli") {
 $sqlw = sql_pre_query("REPLACE \"".$sqltable."sessions\" VALUES('$id','$data', $time)", array($id,$data,$time));
 $rs = sql_query($sqlw,$SQLStat); }
 if($SQLSType=="pgsql"||