Small update.

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

diff --git a/inc/misc/functions.php b/inc/misc/functions.php
index 9eea54f..9d1a191 100644 (file)
--- a/inc/misc/functions.php
+++ b/inc/misc/functions.php
@@ -11,7 +11,7 @@
     Copyright 2004-2012 iDB Support - http://idb.berlios.de/
     Copyright 2004-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: functions.php - Last Update: 10/10/2011 SVN 762 - Author: cooldude2k $
+    $FileInfo: functions.php - Last Update: 12/29/2011 SVN 779 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="functions.php"||$File3Name=="/functions.php") {
@@ -426,37 +426,41 @@ function is_empty($var) {
 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())) { 
+if(in_array("md2",hash_algos())&&!function_exists("md2")) { 
 function md2($data) { return hash("md2",$data); } } 
-if(in_array("md4",hash_algos())) { 
+if(in_array("md4",hash_algos())&&!function_exists("md4")) { 
 function md4($data) { return hash("md4",$data); } }
-if(in_array("sha224",hash_algos())) { 
+if(in_array("md5",hash_algos())&&!function_exists("md5")) { 
+function md5($data) { return hash("md5",$data); } }
+if(in_array("sha1",hash_algos())&&!function_exists("sha1")) { 
+function sha1($data) { return hash("sha1",$data); } }
+if(in_array("sha224",hash_algos())&&!function_exists("sha224")) { 
 function sha224($data) { return hash("sha224",$data); } }
-if(in_array("sha256",hash_algos())) { 
+if(in_array("sha256",hash_algos())&&!function_exists("sha256")) { 
 function sha256($data) { return hash("sha256",$data); } }
-if(in_array("sha384",hash_algos())) { 
+if(in_array("sha384",hash_algos())&&!function_exists("sha384")) { 
 function sha384($data) { return hash("sha384",$data); } }
-if(in_array("sha512",hash_algos())) { 
+if(in_array("sha512",hash_algos())&&!function_exists("sha512")) { 
 function sha512($data) { return hash("sha512",$data); } }
-if(in_array("ripemd128",hash_algos())) { 
+if(in_array("ripemd128",hash_algos())&&!function_exists("ripemd128")) { 
 function ripemd128($data) { return hash("ripemd128",$data); } }
-if(in_array("ripemd160",hash_algos())) { 
+if(in_array("ripemd160",hash_algos())&&!function_exists("ripemd160")) { 
 function ripemd160($data) { return hash("ripemd160",$data); } }
-if(in_array("ripemd256",hash_algos())) { 
+if(in_array("ripemd256",hash_algos())&&!function_exists("ripemd256")) { 
 function ripemd256($data) { return hash("ripemd256",$data); } }
-if(in_array("ripemd512",hash_algos())) { 
+if(in_array("ripemd512",hash_algos())&&!function_exists("ripemd512")) { 
 function ripemd320($data) { return hash("ripemd320",$data); } } 
-if(in_array("salsa10",hash_algos())) { 
+if(in_array("salsa10",hash_algos())&&!function_exists("salsa10")) { 
 function salsa10($data) { return hash("salsa10",$data); } }
-if(in_array("salsa20",hash_algos())) { 
+if(in_array("salsa20",hash_algos())&&!function_exists("salsa20")) { 
 function salsa20($data) { return hash("salsa20",$data); } } 
-if(in_array("snefru",hash_algos())) { 
+if(in_array("snefru",hash_algos())&&!function_exists("snefru")) { 
 function snefru($data) { return hash("snefru",$data); } }
-if(in_array("snefru256",hash_algos())) { 
+if(in_array("snefru256",hash_algos())&&!function_exists("snefru256")) { 
 function snefru256($data) { return hash("snefru256",$data); } }
-if(in_array("gost",hash_algos())) { 
+if(in_array("gost",hash_algos())&&!function_exists("gost")) { 
 function gost($data) { return hash("gost",$data); } } 
-if(in_array("joaat",hash_algos())) { 
+if(in_array("joaat",hash_algos())&&!function_exists("joaat")) { 
 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') {

diff --git a/inc/versioninfo.php b/inc/versioninfo.php
index 7cf0e39..9585941 100644 (file)
--- a/inc/versioninfo.php
+++ b/inc/versioninfo.php
@@ -11,7 +11,7 @@
     Copyright 2008-2012 iDB Support - http://idb.berlios.de/
     Copyright 2008-2012 Game Maker 2k - http://gamemaker2k.org/
 
-    $FileInfo: versioninfo.php - Last Update: 12/29/2011 SVN 778 - Author: cooldude2k $
+    $FileInfo: versioninfo.php - Last Update: 12/29/2011 SVN 779 - Author: cooldude2k $
 */
 $File3Name = basename($_SERVER['SCRIPT_NAME']);
 if ($File3Name=="versioninfo.php"||$File3Name=="/versioninfo.php") {
@@ -27,7 +27,7 @@ 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 = 778;
+$VER2[0] = "Alpha"; $VER2[1] = "Al"; $VER2[2] = "SVN"; $SubVerN = 779;
 $SVNDay[0] = 12; $SVNDay[1] = 29; $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";