Small bug fix.

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

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 907cfb9..894565c 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2004-2007 Cool Dude 2k - http://intdb.sourceforge.net/
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: versioninfo.php - Last Update: 11/10/2007 SVN 126 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 11/14/2007 SVN 127 - 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] = 2; $VER1[2] = 0; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 126; $RName = "iDB"; $SFName = "IntDB";
-$SVNDay[0] = 11; $SVNDay[1] = 10; $SVNDay[2] = 2007; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Pre-Alpha"; $VER2[1] = "PA"; $VER2[2] = "SVN"; $SubVerN = 127; $RName = "iDB"; $SFName = "IntDB";
+$SVNDay[0] = 11; $SVNDay[1] = 14; $SVNDay[2] = 2007; $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);

diff --git a/install.php b/install.php
index 9b3e7dd..0959f41 100644 (file)
--- a/install.php
+++ b/install.php
@@ -12,7 +12,7 @@
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
     iDB Installer made by Game Maker 2k - http://upload.idb.s1.jcink.com/
 
-    $FileInfo: install.php - Last Update: 10/16/2007 SVN 118 - Author: cooldude2k $
+    $FileInfo: install.php - Last Update: 11/14/2007 SVN 127 - Author: cooldude2k $
 */
 @error_reporting(E_ALL ^ E_NOTICE);
 if(@ini_get("register_globals")) { 
@@ -31,7 +31,14 @@ if ($_GET['act']!="Part4"&&$_POST['act']!="Part4") {
 $SetupDir['setup'] = "setup/"; $ConvertDir['setup'] = $SetupDir['setup'];
 $SetupDir['convert'] = "setup/convert/"; $ConvertDir['convert'] = $SetupDir['convert'];
 $Settings['output_type'] = "html"; $Settings['html_type'] = "xhtml10";
-$Settings['board_name'] = "Installing iDB";
+$Settings['board_name'] = "Installing iDB"; 
+if(!isset($Settings['charset'])) {
+       $Settings['charset'] = "ISO-8859-15"; }
+if(isset($Settings['charset'])) {
+if($Settings['charset']!="ISO-8859-15"&&
+       $Settings['charset']!="ISO-8859-1"&&
+       $Settings['charset']!="UTF-8") {
+       $Settings['charset'] = "ISO-8859-15"; } }
 require($SetupDir['setup'].'preinstall.php');
 require_once($SettDir['inc'].'filename.php');
 require_once($SettDir['inc'].'function.php');

diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index 1912b46..b16dc76 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2007 Game Maker 2k - http://upload.idb.s1.jcink.com/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 11/10/2007 SVN 124 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 11/14/2007 SVN 127 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -72,13 +72,13 @@ $YourDate = GMTimeStamp();
 $YourEditDate = $YourDate + $dayconv['minute'];
 $GSalt = salt_hmac(); $YourSalt = salt_hmac();
 /* Fix The User Info for iDB */
-$_POST['NewBoardName'] = htmlentities($_POST['NewBoardName'], ENT_QUOTES);
+$_POST['NewBoardName'] = htmlspecialchars($_POST['NewBoardName'], ENT_QUOTES, $Settings['charset']);
 $_POST['NewBoardName'] = fixbamps($_POST['NewBoardName']);
 $_POST['NewBoardName'] = @remove_spaces($_POST['NewBoardName']);
 $_POST['NewBoardName'] = str_replace("\'", "'", $_POST['NewBoardName']);
-//$_POST['AdminPassword'] = stripcslashes(htmlentities($_POST['AdminPassword'], ENT_QUOTES));
+//$_POST['AdminPassword'] = stripcslashes(htmlspecialchars($_POST['AdminPassword'], ENT_QUOTES, $Settings['charset']));
 //$_POST['AdminPassword'] = preg_replace("/\&#(.*?);/is", "&#$1;", $_POST['AdminPassword']);
-$_POST['AdminUser'] = stripcslashes(htmlspecialchars($_POST['AdminUser'], ENT_QUOTES));
+$_POST['AdminUser'] = stripcslashes(htmlspecialchars($_POST['AdminUser'], ENT_QUOTES, $Settings['charset']));
 //$_POST['AdminUser'] = preg_replace("/&#(x[a-f0-9]+|[0-9]+);/i", "&#$1;", $_POST['AdminUser']);
 $_POST['AdminUser'] = @remove_spaces($_POST['AdminUser']);
 if ($_POST['AdminUser']=="Guest") { $Error="Yes";
@@ -122,7 +122,7 @@ mysql_query($query);
 $query = query("INSERT INTO `".$_POST['tableprefix']."posts` VALUES (1,1,1,1,-1,'Cool Dude 2k',%i,%i,1,'Welcome to Your Message Board. :) ','Install was successful','127.0.0.1','127.0.0.1')", array($YourDate,$YourEditDate)); 
 mysql_query($query);
 $NewPassword = b64e_hmac($_POST['AdminPasswords'],$YourDate,$YourSalt,"sha1");
-//$Name = stripcslashes(htmlspecialchars($AdminUser, ENT_QUOTES));
+//$Name = stripcslashes(htmlspecialchars($AdminUser, ENT_QUOTES, $Settings['charset']));
 //$YourWebsite = "http://".$_SERVER['HTTP_HOST'].$this_dir."index.php?act=view";
 $YourWebsite = $_POST['WebURL'];
 $UserIP = $_SERVER['REMOTE_ADDR'];
@@ -140,7 +140,7 @@ if($csrand==3) { $gpass .= chr(rand(97,122)); }
 ++$i; } $GuestPassword = b64e_hmac($gpass,$YourDate,$GSalt,"sha1");
 $url_this_dir = "http://".$_SERVER['HTTP_HOST'].$this_dir."index.php?act=view";
 $YourIP = $_SERVER['REMOTE_ADDR'];
-$query = query("INSERT INTO `".$_POST['tableprefix']."members` VALUES (-1,'Guest','%s','iDBH','%s',4,'no',0,'Guest Account','Guest',%i,%i,'0','0','0','[B]Test[/B] :)','Your Notes','http://','100x100','%s','UnKnow',1,'%s','%s','iDB','127.0.0.1','%s')", array($GuestPassword,$GEmail,$YourDate,$YourDate,'0',$YourWebsite,$AdminTime,$AdminDST,$GSalt));
+$query = query("INSERT INTO `".$_POST['tableprefix']."members` VALUES (-1,'Guest','%s','iDBH','%s',4,'no',0,'Guest Account','Guest',%i,%i,'0','0','0','0','[B]Test[/B] :)','Your Notes','http://','100x100','%s','UnKnow',1,'%s','%s','iDB','127.0.0.1','%s')", array($GuestPassword,$GEmail,$YourDate,$YourDate,$YourWebsite,$AdminTime,$AdminDST,$GSalt));
 mysql_query($query);
 $query = query("INSERT INTO `".$_POST['tableprefix']."members` VALUES (1,'%s','%s','iDBH','%s',1,'yes',0,'%s','Admin',%i,%i,'0','0','0','0','%s','Your Notes','%s','100x100','%s','UnKnow',0,'%s','%s','iDB','%s','%s')", array($_POST['AdminUser'],$NewPassword,$Email,$Interests,$YourDate,$YourDate,$NewSignature,$Avatar,$YourWebsite,$AdminTime,$AdminDST,$UserIP,$YourSalt));
 mysql_query($query);