OSDN Git Service

Small bugfix.
authorKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Fri, 14 Sep 2018 06:28:00 +0000 (01:28 -0500)
committerKazuki Przyborowski <kazuki.przyborowski@gmail.com>
Fri, 14 Sep 2018 06:28:00 +0000 (01:28 -0500)
inc/admin/main.php
inc/members.php
inc/misc/functions.php
inc/profilemain.php
inc/versioninfo.php
setup/mkconfig.php
setup/setup.php
sql.php

index a2cd3b7..da674d6 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2017 iDB Support - http://idb.berlios.de/
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: main.php - Last Update: 09/14/2018 SVN 878 - Author: cooldude2k $
+    $FileInfo: main.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="main.php"||$File3Name=="/main.php") {
@@ -682,13 +682,13 @@ if(in_array("md2",hash_algos())) { ?>
 <?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("sha3-224",hash_algos())) { ?>
-<option<?php if($Settings['use_hashtype']=="sha3224") { echo " selected=\"selected\""; } ?> value="sha3224">SHA3-224</option>
+<option<?php if($Settings['use_hashtype']=="sha3-224") { echo " selected=\"selected\""; } ?> value="sha3-224">SHA3-224</option>
 <?php } if(in_array("sha3-256",hash_algos())) { ?>
-<option<?php if($Settings['use_hashtype']=="sha3256") { echo " selected=\"selected\""; } ?> value="sha3256">SHA3-256</option>
+<option<?php if($Settings['use_hashtype']=="sha3-256") { echo " selected=\"selected\""; } ?> value="sha3-256">SHA3-256</option>
 <?php } if(in_array("sha3-384",hash_algos())) { ?>
-<option<?php if($Settings['use_hashtype']=="sha3384") { echo " selected=\"selected\""; } ?> value="sha3384">SHA3-384</option>
+<option<?php if($Settings['use_hashtype']=="sha3-384") { echo " selected=\"selected\""; } ?> value="sha3-384">SHA3-384</option>
 <?php } if(in_array("sha3-512",hash_algos())) { ?>
-<option<?php if($Settings['use_hashtype']=="sha3512") { echo " selected=\"selected\""; } ?> value="sha3512">SHA3-512</option>
+<option<?php if($Settings['use_hashtype']=="sha3-512") { echo " selected=\"selected\""; } ?> value="sha3-512">SHA3-512</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())) { ?>
@@ -1077,10 +1077,10 @@ if($_POST['PassHashType']!="md2"&&
    $_POST['PassHashType']!="sha256"&&
    $_POST['PassHashType']!="sha384"&&
    $_POST['PassHashType']!="sha512"&&
-   $_POST['PassHashType']!="sha3224"&&
-   $_POST['PassHashType']!="sha3256"&&
-   $_POST['PassHashType']!="sha3384"&&
-   $_POST['PassHashType']!="sha3512"&&
+   $_POST['PassHashType']!="sha3-224"&&
+   $_POST['PassHashType']!="sha3-256"&&
+   $_POST['PassHashType']!="sha3-384"&&
+   $_POST['PassHashType']!="sha3-512"&&
    $_POST['PassHashType']!="ripemd128"&&
    $_POST['PassHashType']!="ripemd160"&&
    $_POST['PassHashType']!="ripemd256"&&
index f6bdab7..8f8f080 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2017 iDB Support - http://idb.berlios.de/
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: members.php - Last Update: 09/13/2018 SVN 877 - Author: cooldude2k $
+    $FileInfo: members.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="members.php"||$File3Name=="/members.php") {
@@ -1198,13 +1198,13 @@ if($Settings['use_hashtype']=="sha384") { $iDBHash = "iDBH384";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha384"); }
 if($Settings['use_hashtype']=="sha512") { $iDBHash = "iDBH512";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha512"); }
-if($Settings['use_hashtype']=="sha3224") { $iDBHash = "iDBH3224";
+if($Settings['use_hashtype']=="sha3-224") { $iDBHash = "iDBH3224";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha3-224"); }
-if($Settings['use_hashtype']=="sha3256") { $iDBHash = "iDBH3256";
+if($Settings['use_hashtype']=="sha3-256") { $iDBHash = "iDBH3256";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha3-256"); }
-if($Settings['use_hashtype']=="sha3384") { $iDBHash = "iDBH3384";
+if($Settings['use_hashtype']=="sha3-384") { $iDBHash = "iDBH3384";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha3-384"); }
-if($Settings['use_hashtype']=="sha3512") { $iDBHash = "iDBH3512";
+if($Settings['use_hashtype']=="sha3-512") { $iDBHash = "iDBH3512";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"sha3-512"); }
 if($Settings['use_hashtype']=="ripemd128") { $iDBHash = "iDBHRMD128";
 $NewPassword = b64e_hmac($_POST['userpass'],$JoinedPass,$NewHashSalt,"ripemd128"); }
@@ -1833,13 +1833,13 @@ if($Settings['use_hashtype']=="sha384") { $iDBHash = "iDBH384";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha384"); }
 if($Settings['use_hashtype']=="sha512") { $iDBHash = "iDBH512";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha512"); }
-if($Settings['use_hashtype']=="sha3224") { $iDBHash = "iDBH3224";
+if($Settings['use_hashtype']=="sha3-224") { $iDBHash = "iDBH3224";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha3-224"); }
-if($Settings['use_hashtype']=="sha3256") { $iDBHash = "iDBH3256";
+if($Settings['use_hashtype']=="sha3-256") { $iDBHash = "iDBH3256";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha3-256"); }
-if($Settings['use_hashtype']=="sha3384") { $iDBHash = "iDBH3384";
+if($Settings['use_hashtype']=="sha3-384") { $iDBHash = "iDBH3384";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha3-384"); }
-if($Settings['use_hashtype']=="sha3512") { $iDBHash = "iDBH3512";
+if($Settings['use_hashtype']=="sha3-512") { $iDBHash = "iDBH3512";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"sha3-512"); }
 if($Settings['use_hashtype']=="ripemd128") { $iDBHash = "iDBHRMD128";
 $NewPassword = b64e_hmac($_POST['Password'],$_POST['Joined'],$HashSalt,"ripemd128"); }
index 6f71cf7..4fe07d4 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2017 iDB Support - http://idb.berlios.de/
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: functions.php - Last Update: 01/26/2017 SVN 810 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -431,13 +431,13 @@ function sha384($data) { return hash("sha384",$data); } }
 if(in_array("sha512",hash_algos())&&!function_exists("sha512")) { 
 function sha512($data) { return hash("sha512",$data); } }
 if(in_array("sha3-224",hash_algos())&&!function_exists("sha3-224")) { 
-function sha3224($data) { return hash("sha3-224",$data); } }
+function sha3-224($data) { return hash("sha3-224",$data); } }
 if(in_array("sha3-256",hash_algos())&&!function_exists("sha3-256")) { 
-function sha3256($data) { return hash("sha3-256",$data); } }
+function sha3-256($data) { return hash("sha3-256",$data); } }
 if(in_array("sha3-384",hash_algos())&&!function_exists("sha3-384")) { 
-function sha3384($data) { return hash("sha3-384",$data); } }
+function sha3-384($data) { return hash("sha3-384",$data); } }
 if(in_array("sha3-512",hash_algos())&&!function_exists("sha3-512")) { 
-function sha3512($data) { return hash("sha3-512",$data); } }
+function sha3-512($data) { return hash("sha3-512",$data); } }
 if(in_array("ripemd128",hash_algos())&&!function_exists("ripemd128")) { 
 function ripemd128($data) { return hash("ripemd128",$data); } }
 if(in_array("ripemd160",hash_algos())&&!function_exists("ripemd160")) { 
index 699b505..4d35532 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2017 iDB Support - http://idb.berlios.de/
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: profilemain.php - Last Update: 09/12/2018 SVN 871 - Author: cooldude2k $
+    $FileInfo: profilemain.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="profilemain.php"||$File3Name=="/profilemain.php") {
@@ -1255,13 +1255,13 @@ if($YourPassword!=$OldPassword) { $Error="Yes"; ?>
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha384"); }
        if($Settings['use_hashtype']=="sha512") { $iDBHash = "iDBH512";
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha512"); }
-       if($Settings['use_hashtype']=="sha3224") { $iDBHash = "iDBH3224";
+       if($Settings['use_hashtype']=="sha3-224") { $iDBHash = "iDBH3224";
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha3-224"); }
-       if($Settings['use_hashtype']=="sha3256") { $iDBHash = "iDBH3256";
+       if($Settings['use_hashtype']=="sha3-256") { $iDBHash = "iDBH3256";
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha3-256"); }
-       if($Settings['use_hashtype']=="sha3384") { $iDBHash = "iDBH3384";
+       if($Settings['use_hashtype']=="sha3-384") { $iDBHash = "iDBH3384";
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha3-384"); }
-       if($Settings['use_hashtype']=="sha3512") { $iDBHash = "iDBH3512";
+       if($Settings['use_hashtype']=="sha3-512") { $iDBHash = "iDBH3512";
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"sha3-512"); }
        if($Settings['use_hashtype']=="ripemd128") { $iDBHash = "iDBHRMD128";
        $NewPassword = b64e_hmac($_POST['Password'],$OldJoined,$NewSalt,"ripemd128"); }
index bb144f5..270c36b 100644 (file)
@@ -11,7 +11,7 @@
     Copyright 2004-2017 iDB Support - http://idb.berlios.de/\r
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/\r
 \r
-    $FileInfo: versioninfo.php - Last Update: 09/14/2018 SVN 878 - Author: cooldude2k $\r
+    $FileInfo: versioninfo.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $\r
 */\r
 $File3Name = basename($_SERVER['SCRIPT_NAME']);\r
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {\r
@@ -27,7 +27,7 @@ function version_info($proname,$subver,$ver,$supver,$reltype,$svnver,$showsvn) {
        return $return_var; }\r
 // Version number and date stuff. :P\r
 $VER1[0] = 0; $VER1[1] = 5; $VER1[2] = 0; $VERFull[1] = $VER1[0].".".$VER1[1].".".$VER1[2];\r
-$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 878;\r
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 879;\r
 $SVNDay[0] = 9; $SVNDay[1] = 14; $SVNDay[2] = 2018; $SVNDay[3] = $SVNDay[0]."/".$SVNDay[1]."/".$SVNDay[2];\r
 $AltName = "DF2k"; $AltName2 = "DF2k"; $RName = "iDB"; $SFName = "IntDB";\r
 $RFullName = "Internet Discussion Boards"; $AltFullName = "Discussion Forums 2k"; $AltGM2k = "Game Maker 2k";\r
index c815c73..b861f5e 100644 (file)
@@ -12,7 +12,7 @@
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: mkconfig.php - Last Update: 01/26/2017 SVN 810 - Author: cooldude2k $
+    $FileInfo: mkconfig.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="mkconfig.php"||$File3Name=="/mkconfig.php") {
@@ -187,10 +187,10 @@ if($_POST['usehashtype']!="md2"&&
    $_POST['usehashtype']!="sha256"&&
    $_POST['usehashtype']!="sha384"&&
    $_POST['usehashtype']!="sha512"&&
-   $_POST['usehashtype']!="sha3224"&&
-   $_POST['usehashtype']!="sha3256"&&
-   $_POST['usehashtype']!="sha3384"&&
-   $_POST['usehashtype']!="sha3512"&&
+   $_POST['usehashtype']!="sha3-224"&&
+   $_POST['usehashtype']!="sha3-256"&&
+   $_POST['usehashtype']!="sha3-384"&&
+   $_POST['usehashtype']!="sha3-512"&&
    $_POST['usehashtype']!="ripemd128"&&
    $_POST['usehashtype']!="ripemd160"&&
    $_POST['usehashtype']!="ripemd256"&&
@@ -205,10 +205,10 @@ if($_POST['usehashtype']=="sha224") { $iDBHashType = "iDBH224"; }
 if($_POST['usehashtype']=="sha256") { $iDBHashType = "iDBH256"; }
 if($_POST['usehashtype']=="sha384") { $iDBHashType = "iDBH384"; }
 if($_POST['usehashtype']=="sha512") { $iDBHashType = "iDBH512"; }
-if($_POST['usehashtype']=="sha3224") { $iDBHashType = "iDBH3224"; }
-if($_POST['usehashtype']=="sha3256") { $iDBHashType = "iDBH3256"; }
-if($_POST['usehashtype']=="sha3384") { $iDBHashType = "iDBH3384"; }
-if($_POST['usehashtype']=="sha3512") { $iDBHashType = "iDBH3512"; }
+if($_POST['usehashtype']=="sha3-224") { $iDBHashType = "iDBH3224"; }
+if($_POST['usehashtype']=="sha3-256") { $iDBHashType = "iDBH3256"; }
+if($_POST['usehashtype']=="sha3-384") { $iDBHashType = "iDBH3384"; }
+if($_POST['usehashtype']=="sha3-512") { $iDBHashType = "iDBH3512"; }
 if($_POST['usehashtype']=="ripemd128") { $iDBHashType = "iDBHRMD128"; }
 if($_POST['usehashtype']=="ripemd160") { $iDBHashType = "iDBHRMD160"; }
 if($_POST['usehashtype']=="ripemd256") { $iDBHashType = "iDBHRMD256"; }
index fa88952..185277b 100644 (file)
@@ -12,7 +12,7 @@
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
     iDB Installer made by Game Maker 2k - http://idb.berlios.net/
 
-    $FileInfo: setup.php - Last Update: 09/12/2018 SVN 871 - Author: cooldude2k $
+    $FileInfo: setup.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="setup.php"||$File3Name=="/setup.php") {
@@ -252,13 +252,13 @@ if(in_array("md2",hash_algos())) { ?>
 <?php } if(in_array("sha512",hash_algos())) { ?>
 <option value="sha512">SHA512</option>
 <?php } if(in_array("sha3-224",hash_algos())) { ?>
-<option value="sha3224">SHA3-224</option>
+<option value="sha3-224">SHA3-224</option>
 <?php } if(in_array("sha3-256",hash_algos())) { ?>
-<option value="sha3256">SHA3-256</option>
+<option value="sha3-256">SHA3-256</option>
 <?php } if(in_array("sha3-384",hash_algos())) { ?>
-<option value="sha3384">SHA3-384</option>
+<option value="sha3-384">SHA3-384</option>
 <?php } if(in_array("sha3-512",hash_algos())) { ?>
-<option value="sha3512">SHA3-512</option>
+<option value="sha3-512">SHA3-512</option>
 <?php } if(in_array("ripemd128",hash_algos())) { ?>
 <option value="ripemd128">RIPEMD128</option>
 <?php } if(in_array("ripemd160",hash_algos())) { ?>
diff --git a/sql.php b/sql.php
index b42abf1..e7a99a9 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -11,7 +11,7 @@
     Copyright 2004-2017 iDB Support - http://idb.berlios.de/
     Copyright 2004-2017 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: sql.php - Last Update: 01/26/2017 SVN 810 - Author: cooldude2k $
+    $FileInfo: sql.php - Last Update: 09/14/2018 SVN 879 - Author: cooldude2k $
 */
 /* Some ini setting changes uncomment if you need them. 
    Display PHP Errors */
@@ -244,10 +244,10 @@ if($Settings['use_hashtype']!="md2"&&
    $Settings['use_hashtype']!="sha256"&&
    $Settings['use_hashtype']!="sha384"&&
    $Settings['use_hashtype']!="sha512"&&
-   $Settings['use_hashtype']!="sha3224"&&
-   $Settings['use_hashtype']!="sha3256"&&
-   $Settings['use_hashtype']!="sha3384"&&
-   $Settings['use_hashtype']!="sha3512"&&
+   $Settings['use_hashtype']!="sha3-224"&&
+   $Settings['use_hashtype']!="sha3-256"&&
+   $Settings['use_hashtype']!="sha3-384"&&
+   $Settings['use_hashtype']!="sha3-512"&&
    $Settings['use_hashtype']!="ripemd128"&&
    $Settings['use_hashtype']!="ripemd160"&&
    $Settings['use_hashtype']!="ripemd256"&&