OSDN Git Service

Small bug fix.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 30 Dec 2009 04:21:22 +0000 (04:21 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Wed, 30 Dec 2009 04:21:22 +0000 (04:21 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@435 2b68903e-0b30-0410-9a39-a2e4f3c5be39

inc/versioninfo.php
install.php
setup/setup.php
sql.php

index 986ecaa..d34d884 100644 (file)
@@ -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/25/2009 SVN 434 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/29/2009 SVN 435 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,8 +27,8 @@ 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] = 6; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 434; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 12; $SVNDay[1] = 25; $SVNDay[2] = 2009; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 435; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 12; $SVNDay[1] = 29; $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);
 $VerInfo['iDB_Full_Ver'] = version_info($RName,$VER1[0],$VER1[1],$VER1[2],$VER2[0],$SubVerN,false);
index 53e8dba..acddd22 100644 (file)
@@ -12,7 +12,7 @@
     Copyright 2004-2009 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.de/support/category.php?act=view&id=2
 
-    $FileInfo: install.php - Last Update: 12/07/2009 SVN 380 - Author: cooldude2k $
+    $FileInfo: install.php - Last Update: 12/29/2009 SVN 435 - Author: cooldude2k $
 *//*
 if(ini_get("register_globals")) {
 require_once('inc/misc/killglobals.php'); }
index ac014b5..c8e0692 100644 (file)
@@ -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/19/2009 SVN 431 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 12/29/2009 SVN 435 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -196,11 +196,15 @@ echo "<option value=\"".$showmin."\">0:".$showmin." minutes</option>\n"; }
 $skindir = dirname(realpath("settings.php"))."/".$SettDir['themes'];
 if ($handle = opendir($skindir)) { $dirnum = null;
    while (false !== ($file = readdir($handle))) {
+          $selected = null;
           if ($dirnum==null) { $dirnum = 0; }
           if (file_exists($skindir.$file."/info.php")) {
                   if ($file != "." && $file != "..") {
           include($skindir.$file."/info.php");
-       $themelist[$dirnum] =  "<option value=\"".$file."\">".$ThemeInfo['ThemeName']."</option>";
+          if($file=="iDB") { 
+       $themelist[$dirnum] =  "<option value=\"".$file."\" selected=\"selected\">".$ThemeInfo['ThemeName']."</option>"; }
+          if($file!="iDB") {
+          $themelist[$dirnum] =  "<option value=\"".$file."\">".$ThemeInfo['ThemeName']."</option>"; }
           ++$dirnum; } } }
    closedir($handle); asort($themelist);
    $themenum=count($themelist); $themei=0; 
diff --git a/sql.php b/sql.php
index 34a1cf0..dac1081 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/19/2009 SVN 427 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 12/29/2009 SVN 435 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -37,6 +37,10 @@ if ($File3Name=="sql.php"||$File3Name=="/sql.php") {
        header('Location: index.php');
        exit(); }
 require('settings.php');
+if(!isset($Settings['idburl'])) { $Settings['idburl'] = null; }
+if(!isset($Settings['fixbasedir'])) { $Settings['fixbasedir'] = null; }
+if(!isset($Settings['fixpathinfo'])) { $Settings['fixpathinfo'] = null; }
+if(!isset($Settings['fixcookiedir'])) { $Settings['fixcookiedir'] = null; }
 $Settings['bid'] = base64_encode(urlencode($Settings['idburl']));
 if(!isset($Settings['showverinfo'])) { 
        $Settings['showverinfo'] = "on"; }