X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=c171e6217fb7d810a2e926a427a8d6c699c42c1b;hb=1fd39b2564946ce7f19776abab8d65a31928fba1;hp=fbfc36201714a216853d3f13295b90e057134500;hpb=c72268213d4d4829d845d39c101bb08fbe4ed79a;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index fbfc362017..c171e6217f 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -89,7 +89,7 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
 
 // Getter for total fatal message count
 function getTotalFatalErrors () {
-	// Init coun
+	// Init count
 	$count = '0';
 
 	// Do we have at least the first entry?
@@ -376,25 +376,26 @@ function translateComma ($dotted, $cut = true, $max = '0') {
 		if (count($com) < 2) {
 			// Don't display commatas even if there are none... ;-)
 			$maxComma = '0';
-		}
+		} // END - if
 	} // END - if
 
 	// Debug log
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
 
 	// Translate it now
+	$translated = $dotted;
 	switch (getLanguage()) {
 		case 'de': // German language
-			$dotted = number_format($dotted, $maxComma, ',', '.');
+			$translated = number_format($dotted, $maxComma, ',', '.');
 			break;
 
 		default: // All others
-			$dotted = number_format($dotted, $maxComma, '.', ',');
+			$translated = number_format($dotted, $maxComma, '.', ',');
 			break;
 	} // END - switch
 
 	// Return translated value
-	return $dotted;
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'dotted=' . $dotted . ',translated=' . $translated . ',maxComma=' . $maxComma);
+	return $translated;
 }
 
 // Translate Uni*-like gender to human-readable
@@ -498,7 +499,7 @@ function countSelection ($array) {
 	// Integrity check
 	if (!is_array($array)) {
 		// Not an array!
-		debug_report_bug(__FUNCTION__.': No array provided.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'No array provided.');
 	} // END - if
 
 	// Init count
@@ -907,7 +908,7 @@ function sendRawRequest ($host, $request) {
 	$useProxy = false;
 
 	// Are proxy settins set?
-	if ((isConfigEntrySet('proxy_host')) && (getConfig('proxy_host') != '') && (isConfigEntrySet('proxy_port')) && (getConfig('proxy_port') > 0)) {
+	if (isProxyUsed()) {
 		// Then use it
 		$useProxy = true;
 	} // END - if
@@ -1179,7 +1180,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 		// Sanity check on salt
 		if (strlen($salt) != getSaltLength()) {
 			// Not the same!
-			debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')');
+			debug_report_bug(__FUNCTION__, __LINE__, 'salt length mismatch! ('.strlen($salt).'/'.getSaltLength().')');
 		} // END - if
 	}
 
@@ -1919,13 +1920,13 @@ function determineReferalId () {
 	} elseif (isGetRequestParameterSet('ref')) {
 		// Set refid=ref (the referal link uses such variable)
 		$GLOBALS['refid'] = secureString(getRequestParameter('ref'));
-	} elseif ((isSessionVariableSet('refid')) && (getSession('refid') > 0)) {
+	} elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
 		// Set session refid als global
 		$GLOBALS['refid'] = bigintval(getSession('refid'));
 	} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isRandomReferalIdEnabled())) {
 		// Select a random user which has confirmed enougth mails
 		$GLOBALS['refid'] = determineRandomReferalId();
-	} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (getConfig('def_refid') > 0)) {
+	} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.1.2')) && (isValidUserId(getConfig('def_refid')))) {
 		// Set default refid as refid in URL
 		$GLOBALS['refid'] = getConfig('def_refid');
 	} else {
@@ -1934,7 +1935,7 @@ function determineReferalId () {
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) {
+	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
 		// Default is not found
 		$found = false;