X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=99ff9804f5ebc9e3fea65fc32852eb39ed54374f;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=7c3470844ca825ef499ceb334fc567a2ad72f2c6;hpb=9c42e31999a07ac69b0248b79649ea40e3396b12;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 7c3470844c..99ff9804f5 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -357,12 +357,6 @@ function translateYesNo ($yn) {
 	return $GLOBALS[__FUNCTION__][$yn];
 }
 
-// Translates the "pool type" into human-readable
-function translatePoolType ($type) {
-	// Return "translation"
-	return sprintf("{--POOL_TYPE_%s--}", $type);
-}
-
 // Translates the american decimal dot into a german comma
 function translateComma ($dotted, $cut = true, $max = '0') {
 	// First, cast all to double, due to PHP changes
@@ -652,7 +646,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums
 
 
 //
-// Deprecated : $length
+// Deprecated : $length (still has one reference in this function)
 // Optional   : $DATA
 //
 function generateRandomCode ($length, $code, $userid, $DATA = '') {
@@ -704,7 +698,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
 	}
 
 	// At least 10 numbers shall be secure enought!
-	$len = getConfig('code_length');
+	$len = getCodeLength();
 	if ($len == '0') $len = $length;
 	if ($len == '0') $len = 10;
 
@@ -729,7 +723,7 @@ function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
 	// Has the whole value changed?
 	if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true) && (!is_null($num))) {
 		// Log the values
-		debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret=' . $ret . ', num='. $num);
+		debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret[' . gettype($ret) . ']=' . $ret . ', num[' . gettype($num) . ']='. $num);
 	} // END - if
 
 	// Return result
@@ -747,7 +741,7 @@ function createTimestampFromSelections ($prefix, $postData) {
 	$M1   = getMonth();
 
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
-	if ((floor($TEST) == $TEST) && ($M1 == '02') && ($postData[$prefix . '_mo'] > '02'))  $SWITCH = getConfig('ONE_DAY');
+	if ((floor($TEST) == $TEST) && ($M1 == '02') && ($postData[$prefix . '_mo'] > '02'))  $SWITCH = getOneDay();
 
 	// First add years...
 	$ret += $postData[$prefix . '_ye'] * (31536000 + $SWITCH);
@@ -1981,7 +1975,7 @@ function determineReferalId () {
 		} // END - if
 
 		// Set cookie
-		setSession('refid', bigintval($GLOBALS['refid']));
+		setSession('refid', $GLOBALS['refid']);
 	} // END - if
 
 	// Return determined refid
@@ -2234,11 +2228,19 @@ function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
 
 // Initializes the cache instance
 function initCacheInstance () {
+	// Check for double-initialization
+	if (isset($GLOBALS['cache_instance'])) {
+		// This should not happen and must be fixed
+		debug_report_bug(__FUNCTION__, __LINE__, 'Double initialization of cache system detected. cache_instance[]=' . gettype($GLOBALS['cache_instance']));
+	} // END - if
+
 	// Load include for CacheSystem class
 	loadIncludeOnce('inc/classes/cachesystem.class.php');
 
 	// Initialize cache system only when it's needed
 	$GLOBALS['cache_instance'] = new CacheSystem();
+
+	// Did it work?
 	if ($GLOBALS['cache_instance']->getStatus() != 'done') {
 		// Failed to initialize cache sustem
 		addFatalMessage(__FUNCTION__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_CANNOT_INITIALIZE--}');