You can now pick what hash format to use for passwords. :P

[idb/iDB.git.git] / install.php
diff --git a/install.php b/install.php

index 2023f9e..b3cd54f 100644 (file)
--- a/install.php
+++ b/install.php
@@ -8,12 +8,14 @@
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      Revised BSD License for more details.
  
-    Copyright 2004-2008 Cool Dude 2k - http://idb.berlios.de/
-    Copyright 2004-2008 Game Maker 2k - http://intdb.sourceforge.net/
+    Copyright 2004-2009 iDB Support - http://idb.berlios.de/
+    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: 10/22/2008 SVN 182 - Author: cooldude2k $
+    $FileInfo: install.php - Last Update: 6/16/2009 SVN 264 - Author: cooldude2k $
  */
+if(@ini_get("register_globals")) {
+require_once('inc/misc/killglobals.php'); }
  @error_reporting(E_ALL ^ E_NOTICE);
  if(@ini_get("register_globals")) { 
         if(!isset($SettDir['misc'])) { $SettDir['misc'] = "inc/misc/"; }
@@ -42,6 +44,15 @@ if($Settings['charset']!="ISO-8859-15"&&$Settings['charset']!="ISO-8859-1"&&
         $Settings['charset']!="GB2312"&&$Settings['charset']!="BIG5-HKSCS"&&
         $Settings['charset']!="Shift_JIS"&&$Settings['charset']!="EUC-JP") {
         $Settings['charset'] = "ISO-8859-15"; } }
+$SQLCharset = "latin1";
+if(isset($_POST['charset'])) { 
+if($_POST['charset']=="ISO-8859-1") {
+       $SQLCharset = "latin1"; }
+if($_POST['charset']=="ISO-8859-15") {
+       $SQLCharset = "latin1"; }
+if($_POST['charset']=="UTF-8") {
+       $SQLCharset = "utf8"; }
+       $Settings['charset'] = $_POST['charset']; }
  require($SetupDir['setup'].'preinstall.php');
  require_once($SettDir['inc'].'filename.php');
  require_once($SettDir['inc'].'function.php');
@@ -54,15 +65,20 @@ $Error = null; $_GET['time'] = false;
  </head>
  <body>
  <?php require($SettDir['inc'].'navbar.php'); ?>
-
+<div class="Table1Border">
+<?php if($ThemeSet['TableStyle']=="div") { ?>
+<div class="TableRow1">
+<span style="font-weight: bold; text-align: left;"><?php echo $ThemeSet['TitleIcon']; ?><a href="Install.php">Install <?php echo $VerInfo['iDB_Ver_Show']." on ".$OSType2; ?> </a></span>
+</div>
+<?php } ?>
  <table class="Table1">
+<?php if($ThemeSet['TableStyle']=="table") { ?>
  <tr class="TableRow1">
-<td class="TableRow1"><span style="float: left;">
-&nbsp;<a href="Install.php">Install <?php echo $VerInfo['iDB_Ver_Show']." on ".$OSType2; ?> </a></span>
-<span style="float: right;">&nbsp;</span></td>
-</tr>
+<td class="TableColumn1" colspan="2"><span style="font-weight: bold; text-align: left;"><?php echo $ThemeSet['TitleIcon']; ?><a href="Install.php">Install <?php echo $VerInfo['iDB_Ver_Show']." on ".$OSType2; ?> </a></span>
+</td>
+</tr><?php } ?>
  <tr class="TableRow2">
-<th class="TableRow2" style="width: 100%; text-align: left;">
+<th class="TableColumn2" style="width: 100%; text-align: left;">
  <span style="float: left;">&nbsp;Inert your install info: </span>
  <span style="float: right;">&nbsp;</span>
  </th>
@@ -105,7 +121,7 @@ if($_POST['SetupType']=="install") {
  if ($_GET['act']!="Part2"&&$_POST['act']!="Part2") {
  if ($_GET['act']!="Part3"&&$_POST['act']!="Part3") {
  if ($_GET['act']=="Part4"&&$_POST['act']=="Part4") {
-   require($SetupDir['setup'].'/mkconfig.php'); } } } }
+   require($SetupDir['setup'].'mkconfig.php'); } } } }
  if ($Error=="Yes") { ?>
  <br />Install Failed with errors. <a href="install.php?act=view">Click here</a> to restart install. &lt;_&lt;
  <br /><br />
@@ -113,9 +129,9 @@ if ($Error=="Yes") { ?>
  </tr>
  <?php } ?>
  <tr class="TableRow4">
-<td class="TableRow4">&nbsp;<a href="index.php?act=ReadMe">Readme.txt</a>&nbsp;</td>
+<td class="TableColumn4">&nbsp;<a href="index.php?act=ReadMe">Readme.txt</a>&nbsp;</td>
  </tr>
-</table>
+</table></div>
  <div>&nbsp;</div>
  <?php require($SettDir['inc'].'endpage.php'); ?>
  </body>