X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=b21b98e90a754a042def35c4ba88311c7c1348e9;hp=eb0ba63455b268642061309e2d03b24b16963fac;hb=154687dcd45c5b53e323eaba010eabab5950f876;hpb=2c0f5aabd4c866f67705f36f7878dbc223daa9d8

diff --git a/inc/functions.php b/inc/functions.php
index eb0ba63455..b21b98e90a 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -134,7 +134,7 @@ function sendHttpHeaders () {
 	$now = gmdate('D, d M Y H:i:s') . ' GMT';
 
 	// Send HTTP header
-	sendHeader('HTTP/1.1 200');
+	sendHeader('HTTP/1.1 200 OK');
 
 	// General headers for no caching
 	sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21
@@ -496,7 +496,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 		$GLOBALS['tpl_content'] = readFromFile($FQFN);
 
 		// Run code
-		$GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileRawCode(escapeQuotes($GLOBALS['tpl_content']))."\");";
+		$GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
 		eval($GLOBALS['tpl_content']);
 	} elseif (!empty($template)) {
 		// Template file not found!
@@ -536,7 +536,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}<br />");
 
 	// Compile subject line (for POINTS constant etc.)
-	eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");");
+	eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
 
 	// Set from header
 	if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
@@ -582,10 +582,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	}
 
 	// Compile "TO"
-	eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";");
+	eval('$toEmail = "' . compileRawCode(escapeQuotes($toEmail)) . '";');
 
 	// Compile "MSG"
-	eval("\$message = \"".str_replace('$', '&#36;', compileRawCode(escapeQuotes($message)))."\";");
+	eval('$message = "' . str_replace('$', '&#36;', compileRawCode(escapeQuotes($message))) . '";');
 
 	// Fix HTML parameter (default is no!)
 	if (empty($isHtml)) $isHtml = 'N';
@@ -785,6 +785,9 @@ function translatePoolType ($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
+	$dotted = (double) $dotted;
+
 	// Default is 3 you can change this in admin area "Misc -> Misc Options"
 	if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3);
 
@@ -2721,11 +2724,12 @@ function isUrlValidSimple ($url) {
 	$pattern['d1g12']  = $http . $domain1 . $getstring1;
 	$pattern['d2g12']  = $http . $domain2 . $getstring1;
 	$pattern['ipg12']  = $http . $ip . $getstring1;
+
 	// Test all patterns
 	$reg = false;
 	foreach ($pattern as $key => $pat) {
 		// Debug regex?
-		if (isDebugRegExpressionEnabled()) {
+		if (isDebugRegularExpressionEnabled()) {
 			// @TODO Are these convertions still required?
 			$pat = str_replace('.', "&#92;&#46;", $pat);
 			$pat = str_replace('@', "&#92;&#64;", $pat);
@@ -2733,7 +2737,7 @@ function isUrlValidSimple ($url) {
 		} // END - if
 
 		// Check if expression matches
-		$reg = ($reg || preg_match(('^' . $pat.'^'), $url));
+		$reg = ($reg || preg_match(('^' . $pat . '^'), $url));
 
 		// Does it match?
 		if ($reg === true) break;
@@ -2940,14 +2944,14 @@ function handleLoginFailures ($accessLevel) {
 	$OUT = '';
 
 	// Is the session data set?
-	if ((isSessionVariableSet('mxchange_' . $accessLevel . '_failures')) && (isSessionVariableSet('mxchange_' . $accessLevel . '_last_failure'))) {
+	if ((isSessionVariableSet('mailer_' . $accessLevel . '_failures')) && (isSessionVariableSet('mailer_' . $accessLevel . '_last_failure'))) {
 		// Ignore zero values
-		if (getSession('mxchange_' . $accessLevel . '_failures') > 0) {
+		if (getSession('mailer_' . $accessLevel . '_failures') > 0) {
 			// Non-guest has login failures found, get both data and prepare it for template
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "accessLevel={$accessLevel}<br />");
 			$content = array(
-				'login_failures' => getSession('mxchange_' . $accessLevel . '_failures'),
-				'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel . '_last_failure'), 2)
+				'login_failures' => getSession('mailer_' . $accessLevel . '_failures'),
+				'last_failure'   => generateDateTime(getSession('mailer_' . $accessLevel . '_last_failure'), 2)
 			);
 
 			// Load template
@@ -2955,8 +2959,8 @@ function handleLoginFailures ($accessLevel) {
 		} // END - if
 
 		// Reset session data
-		setSession('mxchange_' . $accessLevel . '_failures', '');
-		setSession('mxchange_' . $accessLevel . '_last_failure', '');
+		setSession('mailer_' . $accessLevel . '_failures', '');
+		setSession('mailer_' . $accessLevel . '_last_failure', '');
 	} // END - if
 
 	// Return rendered content
@@ -3931,6 +3935,21 @@ function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') {
 	} // END - foreach
 }
 
+// "Fixes" null or empty string to count of dashes
+function fixNullEmptyToDashes ($str, $num) {
+	// Use str as default
+	$return = $str;
+
+	// Is it empty?
+	if ((is_null($str)) || (trim($str) == '')) {
+		// Set it
+		$return = str_repeat('-', $num);
+	} // END - if
+
+	// Return final string
+	return $return;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////