From 67822c55f4d60d67868b4ab3761bab5a36e82d68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 12 Sep 2008 17:11:29 +0000 Subject: [PATCH] Fix for warning because of string instead of long --- inc/databases.php | 2 +- inc/functions.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index 7198e104ff..98acd27177 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "310"); +define('CURR_SVN_REVISION', "311"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/functions.php b/inc/functions.php index 8b416e865c..b5071b7d41 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1199,7 +1199,7 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") { $keys = SITE_KEY.":".DATE_KEY; if (isset($_CONFIG['secret_key'])) $keys .= ":".$_CONFIG['secret_key']; if (isset($_CONFIG['file_hash'])) $keys .= ":".$_CONFIG['file_hash']; - $keys .= ":".date("d-m-Y (l-F-T)", $_CONFIG['patch_ctime']); + $keys .= ":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime'])); if (isset($_CONFIG['master_salt'])) $keys .= ":".$_CONFIG['master_salt']; // Build string from misc data @@ -1951,7 +1951,7 @@ function generateHash ($plainText, $salt = "") { // Do we miss an arry element here? if (!isset($_CONFIG['file_hash'])) { // Stop here - print(__FUNCTION__.":
");
+		print("Missing file_hash in ".__FUNCTION__.". Backtrace:
");
 		debug_print_backtrace();
 		die("
"); } // END - if @@ -1962,7 +1962,7 @@ function generateHash ($plainText, $salt = "") { $server = $_SERVER['PHP_SELF'].":".getenv('HTTP_USER_AGENT').":".getenv('SERVER_SOFTWARE').":".getenv('REMOTE_ADDR').":".":".filemtime(PATH."inc/databases.php"); // Build key string - $keys = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", $_CONFIG['patch_ctime']).":".$_CONFIG['master_salt']; + $keys = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime'])).":".$_CONFIG['master_salt']; // Additional data $data = $plainText.":".uniqid(rand(), true).":".time(); -- 2.30.2