OSDN Git Service

(root) / idb / iDB.git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7d2ce7)
Some bug fixes and changes.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Mon, 10 Oct 2011 23:30:50 +0000 (23:30 +0000)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Mon, 10 Oct 2011 23:30:50 +0000 (23:30 +0000)
git-svn-id: svn://svn.code.sf.net/p/intdb/svn/trunk@762 2b68903e-0b30-0410-9a39-a2e4f3c5be39

archive/.htaccess [new file with mode: 0644] patch | blob
inc/admin/main.php patch | blob | history
inc/members.php patch | blob | history
inc/misc/functions.php patch | blob | history
inc/profilemain.php patch | blob | history
inc/versioninfo.php patch | blob | history
setup/mkconfig.php patch | blob | history
setup/setup.php patch | blob | history
sql.php patch | blob | history

diff --git a/archive/.htaccess b/archive/.htaccess
new file mode 100644 (file)
index 0000000..6a7c470
--- /dev/null
+++ b/archive/.htaccess
@@ -0,0 +1,8 @@
+Order Deny,Allow
+Deny from all
+
+ <Files "*">
+    Order Deny,Allow
+    Deny from all
+    Satisfy All
+ </Files>
diff --git a/inc/admin/main.php b/inc/admin/main.php
index 76dc91e..f430b74 100644 (file)
--- a/inc/admin/main.php
+++ b/inc/admin/main.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 10/09/2011 SVN 761 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -552,6 +552,51 @@ if(isset($_GET['menu'])&&$_GET['menu']=="main") { $AddChkURL = "&menu=main"; }
        <td style="width: 50%;"><label class="TextBoxLabel" for="WebURL">Insert The WebSite URL:</label></td>
        <td style="width: 50%;"><input type="text" class="TextBox" name="WebURL" size="20" id="WebURL" value="<?php echo $Settings['weburl']; ?>" /></td>
 </tr><tr style="text-align: left;">
+       <td style="width: 50%;"><label class="TextBoxLabel" for="PassHashType">Hash passwords with:</label></td>
+       <td style="width: 50%;"><select id="PassHashType" name="PassHashType" class="TextBox">
+<?php // PHP 5 hash algorithms to functions :o 
+if(function_exists('hash')&&function_exists('hash_algos')) {
+if(in_array("md2",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="md2") { echo " selected=\"selected\""; } ?> value="md2">MD2</option>
+<?php } if(in_array("md4",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="md4") { echo " selected=\"selected\""; } ?> value="md4">MD4</option>
+<?php } if(in_array("md5",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="md5") { echo " selected=\"selected\""; } ?> value="md5">MD5</option>
+<?php } if(in_array("gost",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="gost") { echo " selected=\"selected\""; } ?> value="gost">GOST</option>
+<?php } if(in_array("joaat",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="joaat") { echo " selected=\"selected\""; } ?> value="joaat">JOAAT</option>
+<?php } if(in_array("sha1",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="sha1") { echo " selected=\"selected\""; } ?> value="sha1">SHA1</option>
+<?php } if(in_array("sha224",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="sha224") { echo " selected=\"selected\""; } ?> value="sha224">SHA224</option>
+<?php } if(in_array("sha256",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="sha256") { echo " selected=\"selected\""; } ?> value="sha256">SHA256</option>
+<?php } if(in_array("sha384",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="sha384") { echo " selected=\"selected\""; } ?> value="sha384">SHA384</option>
+<?php } if(in_array("sha512",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="sha512") { echo " selected=\"selected\""; } ?> value="sha512">SHA512</option>
+<?php } if(in_array("salsa10",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="salsa10") { echo " selected=\"selected\""; } ?> value="salsa10">SALSA10</option>
+<?php } if(in_array("salsa20",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="salsa20") { echo " selected=\"selected\""; } ?> value="salsa20">SALSA20</option>
+<?php } if(in_array("snefru256",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="snefru256") { echo " selected=\"selected\""; } ?> value="snefru256">SNEFRU256</option>
+<?php } if(in_array("ripemd128",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="ripemd128") { echo " selected=\"selected\""; } ?> value="ripemd128">RIPEMD128</option>
+<?php } if(in_array("ripemd160",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="ripemd160") { echo " selected=\"selected\""; } ?> value="ripemd160">RIPEMD160</option>
+<?php } if(in_array("ripemd256",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="ripemd256") { echo " selected=\"selected\""; } ?> value="ripemd256">RIPEMD256</option>
+<?php } if(in_array("ripemd320",hash_algos())) { ?>
+<option<?php if($Settings['use_hashtype']=="ripemd320") { echo " selected=\"selected\""; } ?> value="ripemd320">RIPEMD320</option>
+<?php } } 
+if(!function_exists('hash')&&!function_exists('hash_algos')) { ?>
+<option<?php if($Settings['use_hashtype']=="md5") { echo " selected=\"selected\""; } ?> value="md5">MD5</option>
+<option<?php if($Settings['use_hashtype']=="sha1") { echo " selected=\"selected\""; } ?> value="sha1">SHA1</option>
+<?php } ?>
+</select></td>
+</tr><tr style="text-align: left;">
        <td style="width: 50%;"><label class="TextBoxLabel" for="GuestGroup">Insert The Guest Group:</label></td>
        <td style="width: 50%;"><select id="GuestGroup" name="GuestGroup" class="TextBox">
 <option selected="selected" value="<?php echo $Settings['GuestGroup']; ?>">Old Value (<?php echo $Settings['GuestGroup']; ?>)</option>
@@ -852,6 +897,34 @@ $Settings['log_config_format'] = $_POST['iDBLoggerFormat'];
 if($_POST['HTMLType']=="xhtml11") { $_POST['HTMLLevel'] = "Strict"; }
 if($_POST['HTMLType']=="html5") { $_POST['OutPutType'] = "html"; }
 if($_POST['HTMLType']=="xhtml5") { $_POST['OutPutType'] = "xhtml"; }
+if(!isset($_POST['PassHashType'])) {
+       $_POST['PassHashType'] = "sha1"; }
+if(!function_exists('hash')||!function_exists('hash_algos')) {
+if($_POST['PassHashType']!="md5"&&
+   $_POST['PassHashType']!="sha1") {
+       $_POST['PassHashType'] = "sha1"; } }
+if(function_exists('hash')&&function_exists('hash_algos')) {
+if(!in_array($_POST['PassHashType'],hash_algos())) {
+       $_POST['PassHashType'] = "sha1"; }
+if($_POST['PassHashType']!="md2"&&
+   $_POST['PassHashType']!="md4"&&
+   $_POST['PassHashType']!="md5"&&
+   $_POST['PassHashType']!="sha1"&&
+   $_POST['PassHashType']!="sha224"&&
+   $_POST['PassHashType']!="sha256"&&
+   $_POST['PassHashType']!="sha384"&&
+   $_POST['PassHashType']!="sha512"&&
+   $_POST['PassHashType']!="ripemd128"&&
+   $_POST['PassHashType']!="ripemd160"&&
+   $_POST['PassHashType']!="ripemd256"&&
+   $_POST['PassHashType']!="ripemd320"&&
+   $_POST['PassHashType']!="salsa10"&&
+   $_POST['PassHashType']!="salsa20"&&
+   $_POST['PassHashType']!="snefru"&&
+   $_POST['PassHashType']!="snefru256"&&
+   $_POST['PassHashType']!="gost"&&
+   $_POST['PassHashType']!="joaat") {
+       $_POST['PassHashType'] = "sha1"; } }
 $BoardSettings=$pretext2[0]."\n".
 "\$Settings['sqlhost'] = ".null_string($Settings['sqlhost']).";\n".
 "\$Settings['sqldb'] = ".null_string($Settings['sqldb']).";\n".
@@ -880,7 +953,7 @@ $BoardSettings=$pretext2[0]."\n".
 "\$Settings['start_date'] = ".null_string($Settings['start_date']).";\n".
 "\$Settings['idb_time_format'] = ".null_string($Settings['idb_time_format']).";\n".
 "\$Settings['idb_date_format'] = ".null_string($Settings['idb_date_format']).";\n".
-"\$Settings['use_hashtype'] = ".null_string($Settings['use_hashtype']).";\n".
+"\$Settings['use_hashtype'] = ".null_string($_POST['PassHashType']).";\n".
 "\$Settings['charset'] = ".null_string($Settings['charset']).";\n".
 "\$Settings['sql_collate'] = ".null_string($Settings['sql_collate']).";\n".
 "\$Settings['sql_charset'] = ".null_string($Settings['sql_charset']).";\n".
diff --git a/inc/members.php b/inc/members.php
index af4a417..88aed93 100644 (file)
--- a/inc/members.php
+++ b/inc/members.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: members.php - Last Update: 09/29/2011 SVN 760 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -960,8 +960,6 @@ if($HashType=="iDBHSFRU") { $YourPassword = b64e_hmac($_POST['userpass'],$Joined
 if($HashType=="iDBHSFRU256") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$HashSalt,"snefru256"); }
 if($HashType=="iDBHGOST") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$HashSalt,"gost"); }
 if($HashType=="iDBHJOAAT") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$HashSalt,"joaat"); }
-if($HashType=="iDBHFNV132") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$HashSalt,"fnv132"); }
-if($HashType=="iDBHFNV164") { $YourPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$HashSalt,"fnv164"); }
 if($HashType=="NoPass") { $YourPassword = "iDB"; $YourPassTry = "IntDB"; }
 if($HashType=="NoPassword") { $YourPassword = "iDB"; $YourPassTry = "IntDB"; }
 if($HashType=="GuestPass") { $YourPassword = "iDB"; $YourPassTry = "IntDB"; }
@@ -1025,10 +1023,6 @@ if($Settings['use_hashtype']=="gost") { $iDBHash = "iDBHGOST";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"gost"); }
 if($Settings['use_hashtype']=="joaat") { $iDBHash = "iDBHJOAAT";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"joaat"); }
-if($Settings['use_hashtype']=="fnv132") { $iDBHash = "iDBHFNV132";
-$NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"fnv132"); }
-if($Settings['use_hashtype']=="fnv164") { $iDBHash = "iDBHFNV164";
-$NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"fnv164"); }
 $NewDay=GMTimeStamp();
 $NewIP=$_SERVER['REMOTE_ADDR'];
 if($BanError!="yes") {
@@ -1462,10 +1456,6 @@ if($Settings['use_hashtype']=="gost") { $iDBHash = "iDBHGOST";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"gost"); }
 if($Settings['use_hashtype']=="joaat") { $iDBHash = "iDBHJOAAT";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewHashSalt,"joaat"); }
-if($Settings['use_hashtype']=="fnv132") { $iDBHash = "iDBHFNV132";
-$NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewHashSalt,"fnv132"); }
-if($Settings['use_hashtype']=="fnv164") { $iDBHash = "iDBHFNV164";
-$NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewHashSalt,"fnv164"); }
 $_GET['YourPost'] = $_POST['Signature'];
 //require( './'.$SettDir['misc'].'HTMLTags.php');
 $_GET['YourPost'] = htmlspecialchars($_GET['YourPost'], ENT_QUOTES, $Settings['charset']);
diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index 3f1ef39..5bc5cd0 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: functions.php - Last Update: 07/30/2011 SVN 729 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -417,6 +417,8 @@ function is_empty($var) {
     if (((is_null($var) || rtrim($var) == "") &&
                $var !== false) || (is_array($var) && empty($var))) {
         return true; } else { return false; } }
+       $Names['SK'] = "Sarah Kazakis";
+define("_sarah_", $Names['SK']);
 // PHP 5 hash algorithms to functions :o 
 if(function_exists('hash')&&function_exists('hash_algos')) {
 if(in_array("md2",hash_algos())) { 
@@ -448,7 +450,9 @@ function snefru($data) { return hash("snefru",$data); } }
 if(in_array("snefru256",hash_algos())) { 
 function snefru256($data) { return hash("snefru256",$data); } }
 if(in_array("gost",hash_algos())) { 
-function gost($data) { return hash("gost",$data); } } }
+function gost($data) { return hash("gost",$data); } } 
+if(in_array("joaat",hash_algos())) { 
+function joaat($data) { return hash("joaat",$data); } } }
 // Try and convert IPB 2.0.0 style passwords to iDB style passwords
 function hash2xkey($data,$key,$hash1='md5',$hash2='md5') {
   return $hash1($hash2($key).$hash2($data)); }
diff --git a/inc/profilemain.php b/inc/profilemain.php
index fa94cd6..65e7f92 100644 (file)
--- a/inc/profilemain.php
+++ b/inc/profilemain.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: profilemain.php - Last Update: 09/11/2011 SVN 756 - Author: cooldude2k $
+    $FileInfo: profilemain.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="profilemain.php"||$File3Name=="/profilemain.php") {
@@ -936,12 +936,8 @@ if($OldHashType=="iDBHSFRU256") {
        $YourPassword = b64e_hmac($_POST['OldPass'],$OldJoined,$OldSalt,"snefru256"); }
 if($OldHashType=="iDBHGOST") { 
        $YourPassword = b64e_hmac($_POST['OldPass'],$OldJoined,$OldSalt,"gost"); }
-if($HashType=="iDBHJOAAT") { 
+if($OldHashType=="iDBHJOAAT") { 
        $YourPassword = b64e_hmac($_POST['OldPass'],$OldJoined,$OldSalt,"joaat"); }
-if($HashType=="iDBHFNV132") { 
-       $YourPassword = b64e_hmac($_POST['OldPass'],$OldJoined,$OldSalt,"fnv132"); }
-if($HashType=="iDBHFNV164") { 
-       $YourPassword = b64e_hmac($_POST['OldPass'],$OldJoined,$OldSalt,"fnv164"); }
 if($YourPassword!=$OldPassword) { $Error="Yes"; ?>
 <div class="TableMessage" style="text-align: center;">Your old Password did not match.<br />&nbsp;</div>
 <?php } if(pre_strlen($_POST['Password'])>"60") { $Error="Yes"; ?>
@@ -956,45 +952,41 @@ if($YourPassword!=$OldPassword) { $Error="Yes"; ?>
        if($_POST['Password']!="") {
        $NewSalt = salt_hmac(); $NewDay = GMTimeStamp();
        if($Settings['use_hashtype']=="md2") { $iDBHash = "iDBH2";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"md2"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"md2"); }
        if($Settings['use_hashtype']=="md4") { $iDBHash = "iDBH4";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"md4"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"md4"); }
        if($Settings['use_hashtype']=="md5") { $iDBHash = "iDBH5";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"md5"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"md5"); }
        if($Settings['use_hashtype']=="sha1") { $iDBHash = "iDBH";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"sha1"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha1"); }
        if($Settings['use_hashtype']=="sha224") { $iDBHash = "iDBH224";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"sha224"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha224"); }
        if($Settings['use_hashtype']=="sha256") { $iDBHash = "iDBH256";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"sha256"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha256"); }
        if($Settings['use_hashtype']=="sha384") { $iDBHash = "iDBH384";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"sha384"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha384"); }
        if($Settings['use_hashtype']=="sha512") { $iDBHash = "iDBH512";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"sha512"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha512"); }
        if($Settings['use_hashtype']=="ripemd128") { $iDBHash = "iDBHRMD128";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"ripemd128"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"ripemd128"); }
        if($Settings['use_hashtype']=="ripemd160") { $iDBHash = "iDBHRMD160";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"ripemd160"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"ripemd160"); }
        if($Settings['use_hashtype']=="ripemd256") { $iDBHash = "iDBHRMD256";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"ripemd256"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"ripemd256"); }
        if($Settings['use_hashtype']=="ripemd320") { $iDBHash = "iDBHRMD320";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"ripemd320"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"ripemd320"); }
        if($Settings['use_hashtype']=="salsa10") { $iDBHash = "iDBHSALSA10";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"salsa10"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"salsa10"); }
        if($Settings['use_hashtype']=="salsa20") { $iDBHash = "iDBHSALSA20";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"salsa20"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"salsa20"); }
        if($Settings['use_hashtype']=="snefru") { $iDBHash = "iDBHSFRU";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"snefru"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"snefru"); }
        if($Settings['use_hashtype']=="snefru256") { $iDBHash = "iDBHSFRU256";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"snefru256"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"snefru256"); }
        if($Settings['use_hashtype']=="gost") { $iDBHash = "iDBHGOST";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"gost"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"gost"); }
        if($Settings['use_hashtype']=="joaat") { $iDBHash = "iDBHJOAAT";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"joaat"); }
-       if($Settings['use_hashtype']=="fnv132") { $iDBHash = "iDBHFNV132";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"fnv132"); }
-       if($Settings['use_hashtype']=="fnv164") { $iDBHash = "iDBHFNV164";
-       $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$NewSalt,"fnv164"); }
+       $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"joaat"); }
        $_SESSION['UserPass']=$NewPassword;
        if($cookieDomain==null) {
        setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir); }
@@ -1005,7 +997,7 @@ if($YourPassword!=$OldPassword) { $Error="Yes"; ?>
        setcookie("SessPass", $NewPassword, time() + (7 * 86400), $cbasedir, $cookieDomain); } } }
        $_POST['Email'] = remove_spaces($_POST['Email']);
        if($_POST['Password']!="") {
-       $querynewuserinfo = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"UserPassword\"='%s',\"HashType\"='iDBH',\"Email\"='%s',\"LastActive\"=%i,\"IP\"='%s',\"Salt\"='%s' WHERE \"id\"=%i", array($NewPassword,$_POST['Email'],$NewDay,$NewIP,$NewSalt,$_SESSION['UserID']));
+       $querynewuserinfo = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"UserPassword\"='%s',\"HashType\"='%s',\"Email\"='%s',\"LastActive\"=%i,\"IP\"='%s',\"Salt\"='%s' WHERE \"id\"=%i", array($NewPassword,$iDBHash,$_POST['Email'],$NewDay,$NewIP,$NewSalt,$_SESSION['UserID']));
        sql_query($querynewuserinfo,$SQLStat); }
        if($_POST['Password']=="") {
        echo $querynewuserinfo = sql_pre_query("UPDATE \"".$Settings['sqltable']."members\" SET \"Email\"='%s',\"LastActive\"=%i,\"IP\"='%s' WHERE \"id\"=%i", array($_POST['Email'],$NewDay,$NewIP,$_SESSION['UserID']));
diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index cd5b831..8721921 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2008-2011 iDB Support - http://idb.berlios.de/
     Copyright 2008-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 10/09/2011 SVN 761 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 10/10/2011 SVN 762 - 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] = 4; $VER1[2] = 7; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 761;
-$SVNDay[0] = 10; $SVNDay[1] = 09; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 762;
+$SVNDay[0] = 10; $SVNDay[1] = 10; $SVNDay[2] = 2011; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];
 $AltName = "RDB"; $AltName2 = "ReneeDB"; $RName = "iDB"; $SFName = "IntDB";
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Renee Discussion Boards"; $AltGM2k = "ReneeDB Team";
 $VerCheckName = "iDB"; $AltVerCheckName = "RDB"; $AltiDBHome = "http://duckduckgo.com/?q=ReneeDB";
diff --git a/setup/mkconfig.php b/setup/mkconfig.php
index cdd2833..bbc8f49 100644 (file)
--- a/setup/mkconfig.php
+++ b/setup/mkconfig.php
@@ -12,7 +12,7 @@
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 09/11/2011 SVN 756 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -135,9 +135,7 @@ if($_POST['usehashtype']!="md2"&&
    $_POST['usehashtype']!="snefru"&&
    $_POST['usehashtype']!="snefru256"&&
    $_POST['usehashtype']!="gost"&&
-   $_POST['usehashtype']!="joaat"&&
-   $_POST['usehashtype']!="fnv132"&&
-   $_POST['usehashtype']!="fnv164") {
+   $_POST['usehashtype']!="joaat") {
        $_POST['usehashtype'] = "sha1"; } }
 if($_POST['usehashtype']=="md2") { $iDBHashType = "iDBH2"; }
 if($_POST['usehashtype']=="md4") { $iDBHashType = "iDBH4"; }
@@ -157,8 +155,6 @@ if($_POST['usehashtype']=="snefru") { $iDBHashType = "iDBHSFRU"; }
 if($_POST['usehashtype']=="snefru256") { $iDBHashType = "iDBHSFRU256"; }
 if($_POST['usehashtype']=="gost") { $iDBHashType = "iDBHGOST"; }
 if($_POST['usehashtype']=="joaat") { $iDBHashType = "iDBHJOAAT"; }
-if($_POST['usehashtype']=="fnv132") { $iDBHashType = "iDBHFNV132"; }
-if($_POST['usehashtype']=="fnv164") { $iDBHashType = "iDBHFNV164"; }
 if ($_POST['AdminUser']=="Guest") { $Error="Yes";
 echo "<br />You can not use Guest as your name."; }
 /* We are done now with fixing the info. ^_^ */
diff --git a/setup/setup.php b/setup/setup.php
index abfc097..49791d2 100644 (file)
--- a/setup/setup.php
+++ b/setup/setup.php
@@ -12,7 +12,7 @@
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 09/11/2011 SVN 756 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -171,10 +171,6 @@ if(in_array("md2",hash_algos())) { ?>
 <option value="gost">GOST</option>
 <?php } if(in_array("joaat",hash_algos())) { ?>
 <option value="joaat">JOAAT</option>
-<?php } if(in_array("fnv132",hash_algos())) { ?>
-<option value="fnv132">FNV132</option>
-<?php } if(in_array("fnv164",hash_algos())) { ?>
-<option value="fnv164">FNV164</option>
 <?php } if(in_array("sha1",hash_algos())) { ?>
 <option value="sha1">SHA1</option>
 <?php } if(in_array("sha224",hash_algos())) { ?>
diff --git a/sql.php b/sql.php
index ae1ccf1..678560d 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2011 iDB Support - http://idb.berlios.de/
     Copyright 2004-2011 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 09/29/2011 SVN 760 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -201,9 +201,7 @@ if($Settings['use_hashtype']!="md2"&&
    $Settings['use_hashtype']!="snefru"&&
    $Settings['use_hashtype']!="snefru256"&&
    $Settings['use_hashtype']!="gost"&&
-   $Settings['use_hashtype']!="joaat"&&
-   $Settings['use_hashtype']!="fnv132"&&
-   $Settings['use_hashtype']!="fnv164") {
+   $Settings['use_hashtype']!="joaat") {
        $Settings['use_hashtype'] = "sha1"; } }
 // Check to see if variables are set
 require_once($SettDir['misc'].'setcheck.php');
Internet Discussion Boards is a message board system by Game Maker 2k. Its very easy to set up. Your web host needs PHP and CUBRID / MySQL / MariaDB / PostgreSQL / SQLite. Internet Discussion Boards is Open Source so you can make changes to it.
About OSDN
Find Software
Develop Software
Help