From: Kazuki Przyborowski Date: Sat, 12 Dec 2009 08:40:22 +0000 (+0000) Subject: Small bug fix/update. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=efc208d2e755f6b3a6de20c2a38d49600fd2163b;p=idb%2FiDB.git.git Small bug fix/update. git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@399 2b68903e-0b30-0410-9a39-a2e4f3c5be39 --- diff --git a/inc/admin/main.php b/inc/admin/main.php index 2d1e6fa..6d6da2b 100644 --- a/inc/admin/main.php +++ b/inc/admin/main.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: main.php - Last Update: 12/11/2009 SVN 396 - Author: cooldude2k $ + $FileInfo: main.php - Last Update: 12/12/2009 SVN 399 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="main.php"||$File3Name=="/main.php") { @@ -78,6 +78,7 @@ 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"; } @@ -105,7 +106,8 @@ $TblOptimized = 0; while ($ti < $tcount) { if(isset($OptimizeAr["Msg_text"])) { unset($OptimizeAr["Msg_text"]); } if(isset($OptimizeAr[3])) { unset($OptimizeAr[3]); } -if($Settings['sqltype']=="mysql") { +if($Settings['sqltype']=="mysql"|| + $Settings['sqltype']=="mysqli") { $OptimizeTea = sql_query(sql_pre_query("OPTIMIZE TABLE \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); } if($Settings['sqltype']=="pgsql") { $OptimizeTea = sql_query(sql_pre_query("VACUUM ANALYZE \"".$TableChCk[$ti]."\"", array(null)),$SQLStat); } @@ -117,7 +119,8 @@ if(!isset($OptimizeAr["Msg_text"])&& isset($OptimizeAr[3])) { $OptimizeAr["Msg_text"] = $OptimizeAr[3]; } if($OptimizeAr["Msg_text"]=="OK") { ++$TblOptimized; } } ++$ti; } -if($Settings['sqltype']=="mysql") { +if($Settings['sqltype']=="mysql"|| + $Settings['sqltype']=="mysqli") { $OutPutLog = "MySQL Output: ".$TblOptimized." tables optimized."; } if($Settings['sqltype']=="pgsql") { $OutPutLog = "PGSQL Output: All tables optimized."; } diff --git a/inc/admin/sqldumper.php b/inc/admin/sqldumper.php index 3f80fbd..557d5ad 100644 --- a/inc/admin/sqldumper.php +++ b/inc/admin/sqldumper.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: sqldumper.php - Last Update: 12/10/2009 SVN 390 - Author: cooldude2k $ + $FileInfo: sqldumper.php - Last Update: 12/12/2009 SVN 399 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="sqldumper.php"||$File3Name=="/sqldumper.php") { @@ -22,7 +22,7 @@ if($_SESSION['UserGroup']==$Settings['GuestGroup']||$GroupInfo['HasAdminCP']=="n redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']); gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } -if($Settings['sqltype']!="mysql") { +if($Settings['sqltype']!="mysql"&&$Settings['sqltype']!="mysqli") { redirect("location",$basedir.url_maker($exfile['index'],$Settings['file_ext'],"act=view",$Settings['qstr'],$Settings['qsep'],$prexqstr['index'],$exqstr['index'],false)); ob_clean(); header("Content-Type: text/plain; charset=".$Settings['charset']); gzip_page($Settings['use_gzip'],$GZipEncode['Type']); session_write_close(); die(); } @@ -36,8 +36,9 @@ header("Content-Type: application/octet-stream"); header("Content-Transfer-Encoding: binary"); $SQLDumper = "SQL Dumper"; function GetAllRows($table) { $rene_j = 0; $trowout = null; +global $SQLStat; $tresult = sql_query("SELECT * FROM \"".$table."\"",$SQLStat); -while ($trow = sql_fetch_array($tresult, MYSQL_ASSOC)) { +while ($trow = sql_fetch_assoc($tresult)) { $trowout[$rene_j] = $trow; ++$rene_j; } sql_free_result($tresult); @@ -134,8 +135,8 @@ $trownew = $trow[$kazuki_p]; $trowname = array_keys($trownew); $nums = count($trownew); $il = 0; while ($il < $nums) { $tnums = $nums - 1; -$trowrname = sql_escape_string($trowname[$il]); -$trowrvalue = sql_escape_string($trownew[$trowrname]); +$trowrname = sql_escape_string($trowname[$il],$SQLStat); +$trowrvalue = sql_escape_string($trownew[$trowrname],$SQLStat); if($_GET['outtype']=="UTF-8"&&$Settings['charset']!="UTF-8") { $trowrvalue = utf8_encode($trowrvalue); } $trowrvalue = str_replace( array("\n", "\r"), array('\n', '\r'), $trowrvalue); diff --git a/inc/admin/table.php b/inc/admin/table.php index ee8ea77..d120daf 100644 --- a/inc/admin/table.php +++ b/inc/admin/table.php @@ -11,7 +11,7 @@ Copyright 2004-2009 iDB Support - http://idb.berlios.de/ Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/ - $FileInfo: table.php - Last Update: 12/10/2009 SVN 390 - Author: cooldude2k $ + $FileInfo: table.php - Last Update: 12/12/2009 SVN 399 - Author: cooldude2k $ */ $File3Name = basename($_SERVER['SCRIPT_NAME']); if ($File3Name=="table.php"||$File3Name=="/table.php") { @@ -63,7 +63,8 @@ if ($File3Name=="table.php"||$File3Name=="/table.php") { " onclick="window.open(this.href);return false;">Version Checker - + ">SQL Dumper diff --git a/inc/versioninfo.php b/inc/versioninfo.php index de824fc..188784a 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/12/2009 SVN 398 - Author: cooldude2k $ + $FileInfo: versioninfo.php - Last Update: 12/12/2009 SVN 399 - 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 = 398; $RName = "iDB"; $SFName = "IntDB"; +$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 399; $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);