X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=473c494382dfc52f9e3d88e2e1781bc076e9099b;hp=c1293681cef302da6f78545014bd5c7152985f6e;hb=4836fdd88165b4d32f5b826a93467d2bb293e3ad;hpb=9b8d0c1de007c1149af813c07773c3536c71ddd5

diff --git a/inc/functions.php b/inc/functions.php
index c1293681ce..473c494382 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,10 +536,10 @@ 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 ((!eregi('@', $toEmail)) && ($toEmail > 0)) {
+	if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
 		// Value detected, is the message extension installed?
 		// @TODO Extension 'msg' does not exist
 		if (isExtensionActive('msg')) {
@@ -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';
@@ -599,13 +599,13 @@ Message : ' . htmlentities(utf8_decode($message)) . '
 </pre>');
 	} elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
 		// Send mail as HTML away
-		sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
+		return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
 	} elseif (!empty($toEmail)) {
 		// Send Mail away
-		sendRawEmail($toEmail, $subject, $message, $mailHeader);
+		return sendRawEmail($toEmail, $subject, $message, $mailHeader);
 	} elseif ($isHtml != 'Y') {
 		// Problem found!
-		sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
+		return sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
 	}
 }
 
@@ -634,7 +634,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
 		$mail = new PHPMailer();
 
 		// Set charset to UTF-8
-		$mail->CharSet('UTF-8');
+		$mail->CharSet = 'UTF-8';
 
 		// Path for PHPMailer
 		$mail->PluginDir  = sprintf("%sinc/phpmailer/", getConfig('PATH'));
@@ -665,9 +665,21 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
 		$mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
 		$mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER'));
 		$mail->Send();
+
+		// Has an error occured?
+		if (!empty($mail->ErrorInfo)) {
+			// Log message
+			logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
+
+			// Raise an error
+			return false;
+		} else {
+			// All fine!
+			return true;
+		}
 	} else {
 		// Use legacy mail() command
-		mail($toEmail, $subject, decodeEntities($message), $from);
+		return mail($toEmail, $subject, decodeEntities($message), $from);
 	}
 }
 
@@ -773,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);
 
@@ -1182,7 +1197,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 			$year = date('Y', time());
 
 			// Use configured min age or fixed?
-			if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+			if (isExtensionInstalledAndNewer('order', '0.2.1')) {
 				// Configured
 				$startYear = $year - getConfig('min_age');
 			} else {
@@ -1210,7 +1225,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 				// Get current year and subtract the configured minimum age
 				$OUT .= "<option value=\"".($minYear - 1)."\">&lt;" . $minYear."</option>\n";
 				// Calculate earliest year depending on extension version
-				if ((isExtensionActive('other')) && (getExtensionVersion('other') >= '0.2.1')) {
+				if (isExtensionInstalledAndNewer('order', '0.2.1')) {
 					// Use configured minimum age
 					$year = date('Y', time()) - getConfig('min_age');
 				} else {
@@ -1462,38 +1477,38 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"timebox_table dashed\">\n";
 		$OUT .= "<tr>\n";
 
-		if (ereg('Y', $display) || (empty($display))) {
+		if (isInString('Y', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
 		}
 
-		if (ereg('M', $display) || (empty($display))) {
+		if (isInString('M', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
 		}
 
-		if (ereg('W', $display) || (empty($display))) {
+		if (isInString('W', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
 		}
 
-		if (ereg('D', $display) || (empty($display))) {
+		if (isInString('D', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
 		}
 
-		if (ereg('h', $display) || (empty($display))) {
+		if (isInString('h', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
 		}
 
-		if (ereg('m', $display) || (empty($display))) {
+		if (isInString('m', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
 		}
 
-		if (ereg('s', $display) || (empty($display))) {
+		if (isInString('s', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
 		}
 
 		$OUT .= "</tr>\n";
 		$OUT .= "<tr>\n";
 
-		if (ereg('Y', $display) || (empty($display))) {
+		if (isInString('Y', $display) || (empty($display))) {
 			// Generate year selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ye\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 10; $idx++) {
@@ -1506,7 +1521,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_ye" value="0" />';
 		}
 
-		if (ereg('M', $display) || (empty($display))) {
+		if (isInString('M', $display) || (empty($display))) {
 			// Generate month selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mo\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 11; $idx++)
@@ -1520,7 +1535,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_mo" value="0" />';
 		}
 
-		if (ereg('W', $display) || (empty($display))) {
+		if (isInString('W', $display) || (empty($display))) {
 			// Generate week selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_we\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 4; $idx++) {
@@ -1533,7 +1548,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_we" value="0" />';
 		}
 
-		if (ereg('D', $display) || (empty($display))) {
+		if (isInString('D', $display) || (empty($display))) {
 			// Generate day selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_da\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 31; $idx++) {
@@ -1546,7 +1561,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_da" value="0" />';
 		}
 
-		if (ereg('h', $display) || (empty($display))) {
+		if (isInString('h', $display) || (empty($display))) {
 			// Generate hour selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ho\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 23; $idx++) 	{
@@ -1559,7 +1574,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_ho" value="0" />';
 		}
 
-		if (ereg('m', $display) || (empty($display))) {
+		if (isInString('m', $display) || (empty($display))) {
 			// Generate minute selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mi\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 59; $idx++) {
@@ -1572,7 +1587,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			$OUT .= '<input type="hidden" name="' . $prefix . '_mi" value="0" />';
 		}
 
-		if (ereg('s', $display) || (empty($display))) {
+		if (isInString('s', $display) || (empty($display))) {
 			// Generate second selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_se\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 59; $idx++) {
@@ -1716,7 +1731,7 @@ function extractHostnameFromUrl (&$script) {
 
 	// Extract host name
 	$host = str_replace('http://', '', $url);
-	if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
+	if (isInString('/', $host)) $host = substr($host, 0, strpos($host, '/'));
 
 	// Generate relative URL
 	//* DEBUG: */ print("SCRIPT=" . $script.'<br />');
@@ -1767,11 +1782,9 @@ function sendGetRequest ($script, $data = array()) {
 	} else {
 		$request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
 	}
-	$request .= 'Accept: text/plain;q=0.8' . getConfig('HTTP_EOL');
+	$request .= 'Accept: image/png,image/*;q=0.8,text/plain,text/html,*/*;q=0.5' . getConfig('HTTP_EOL');
 	$request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
-	$request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
-	$request .= 'Content-Type: text/plain' . getConfig('HTTP_EOL');
-	$request .= 'Content-Length: 0' . getConfig('HTTP_EOL');
+	$request .= 'Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0' . getConfig('HTTP_EOL');
 	$request .= 'Connection: close' . getConfig('HTTP_EOL');
 	$request .= getConfig('HTTP_EOL');
 
@@ -1798,7 +1811,7 @@ function sendPostRequest ($script, $postData) {
 	$body = http_build_query($postData, '', '&');
 
 	// Generate POST request header
-	$request  = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request  = 'POST /' . trim($script) . ' HTTP/1.0' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getConfig('URL') . '/admin.php' . getConfig('HTTP_EOL');
 	$request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('FULL_VERSION') . getConfig('HTTP_EOL');
@@ -1837,14 +1850,26 @@ function sendRawRequest ($host, $request) {
 		$useProxy = true;
 	} // END - if
 
+	// Load include
+	loadIncludeOnce('inc/classes/resolver.class.php');
+
+	// Get resolver instance
+	$resolver = new HostnameResolver();
+
 	// Open connection
 	//* DEBUG: */ die("SCRIPT=" . $script.'<br />');
 	if ($useProxy === true) {
+		// Resolve hostname into IP address
+		$ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host')));
+
 		// Connect to host through proxy connection
-		$fp = fsockopen(compileRawCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
+		$fp = fsockopen($ip, bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
 	} else {
+		// Resolve hostname into IP address
+		$ip = $resolver->resolveHostname($host);
+
 		// Connect to host directly
-		$fp = fsockopen($host, 80, $errno, $errdesc, 30);
+		$fp = fsockopen($ip, 80, $errno, $errdesc, 30);
 	}
 
 	// Is there a link?
@@ -1860,35 +1885,13 @@ function sendRawRequest ($host, $request) {
 
 	// Do we use proxy?
 	if ($useProxy === true) {
-		// Generate CONNECT request header
-		$proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
-		$proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
-
-		// Use login data to proxy? (username at least!)
-		if (getConfig('proxy_username') != '') {
-			// Add it as well
-			$encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileRawCode(getConfig('proxy_password')));
-			$proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
-		} // END - if
+		// Setup proxy tunnel
+		$response = setupProxyTunnel($host, $fp);
 
-		// Add last new-line
-		$proxyTunnel .= getConfig('HTTP_EOL');
-		//* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
-
-		// Write request
-		fwrite($fp, $proxyTunnel);
-
-		// Got response?
-		if (feof($fp)) {
-			// No response received
-			return $response;
-		} // END - if
-
-		// Read the first line
-		$resp = trim(fgets($fp, 10240));
-		$respArray = explode(' ', $resp);
-		if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+		// If the response is invalid, abort
+		if ((count($response) == 3) && (empty($response[0])) && (empty($response[1])) && (empty($response[2]))) {
 			// Invalid response!
+			logDebugMessage(__FUNCTION__, __LINE__, 'Proxy tunnel not working?');
 			return $response;
 		} // END - if
 	} // END - if
@@ -1935,7 +1938,7 @@ function sendRawRequest ($host, $request) {
 	// Time request if debug-mode is enabled
 	if (isDebugModeEnabled()) {
 		// Add debug message...
-		logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds.');
+		logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
 	} // END - if
 
 	// Skip first empty lines
@@ -1961,6 +1964,7 @@ function sendRawRequest ($host, $request) {
 	if (!isset($response[0])) {
 		// No response, maybe timeout
 		$response = array('', '', '');
+		logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
 	} elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
 		// Proxy header detected, so remove two lines
 		array_shift($response);
@@ -1968,8 +1972,9 @@ function sendRawRequest ($host, $request) {
 	} // END - if
 
 	// Was the request successfull?
-	if ((!eregi('200 OK', $response[0])) || (empty($response[0]))) {
+	if ((!isInStringIgnoreCase('200 OK', $response[0])) || (empty($response[0]))) {
 		// Not found / access forbidden
+		logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected status code ' . $response[0] . ' detected. "200 OK" was expected.');
 		$response = array('', '', '');
 	} // END - if
 
@@ -1977,7 +1982,48 @@ function sendRawRequest ($host, $request) {
 	return $response;
 }
 
-// Taken from www.php.net eregi() user comments
+// Sets up a proxy tunnel for given hostname and through resource
+function setupProxyTunnel ($host, $resource) {
+	// Initialize array
+	$response = array('', '', '');
+
+	// Generate CONNECT request header
+	$proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.0' . getConfig('HTTP_EOL');
+	$proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
+
+	// Use login data to proxy? (username at least!)
+	if (getConfig('proxy_username') != '') {
+		// Add it as well
+		$encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password')));
+		$proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
+	} // END - if
+
+	// Add last new-line
+	$proxyTunnel .= getConfig('HTTP_EOL');
+	//* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
+
+	// Write request
+	fwrite($fp, $proxyTunnel);
+
+	// Got response?
+	if (feof($fp)) {
+		// No response received
+		return $response;
+	} // END - if
+
+	// Read the first line
+	$resp = trim(fgets($fp, 10240));
+	$respArray = explode(' ', $resp);
+	if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+		// Invalid response!
+		return $response;
+	} // END - if
+
+	// All fine!
+	return $respArray;
+}
+
+// Taken from www.php.net isInStringIgnoreCase() user comments
 function isEmailValid ($email) {
 	// Check first part of email address
 	$first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
@@ -1992,7 +2038,7 @@ function isEmailValid ($email) {
 	return preg_match($regex, $email);
 }
 
-// Function taken from user comments on www.php.net / function eregi()
+// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
 function isUrlValid ($URL, $compile=true) {
 	// Trim URL a little
 	$URL = trim(urldecode($URL));
@@ -2061,7 +2107,7 @@ function generateEmailLink ($email, $table = 'admins') {
 	if ((isExtensionActive('admins')) && ($table == 'admins')) {
 		// Create email link for contacting admin in guest area
 		$EMAIL = generateAdminEmailLink($email);
-	} elseif ((isExtensionActive('user')) && (getExtensionVersion('user') >= '0.3.3') && ($table == 'user_data')) {
+	} elseif ((isExtensionInstalledAndNewer('user', '0.3.3')) && ($table == 'user_data')) {
 		// Create email link for contacting a member within admin area (or later in other areas, too?)
 		$EMAIL = generateUserEmailLink($email, 'admin');
 	} elseif ((isExtensionActive('sponsor')) && ($table == 'sponsor_data')) {
@@ -2548,6 +2594,7 @@ function getMessageFromErrorCode ($code) {
 		case getCode('MORE_RECEIVERS2')    : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
 		case getCode('MORE_RECEIVERS3')    : $message = getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'); break;
 		case getCode('INVALID_URL')        : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+		case getCode('NO_MAIL_TYPE')       : $message = getMessage('MEMBER_NO_MAIL_TYPE_SELECTED'); break;
 		case getCode('UNKNOWN_ERROR')      : $message = getMessage('LOGIN_UNKNOWN_ERROR'); break;
 		case getCode('UNKNOWN_STATUS')     : $message = getMessage('LOGIN_UNKNOWN_STATUS'); break;
 
@@ -2632,7 +2679,7 @@ function compileUriCode ($code, $simple = true) {
 	return $code;
 }
 
-// Function taken from user comments on www.php.net / function eregi()
+// Function taken from user comments on www.php.net / function isInStringIgnoreCase()
 function isUrlValidSimple ($url) {
 	// Prepare URL
 	$url = secureString(str_replace("\\", '', compileRawCode(urldecode($url))));
@@ -2675,11 +2722,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);
@@ -2687,7 +2735,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;
@@ -2894,14 +2942,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
@@ -2909,8 +2957,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
@@ -3885,6 +3933,43 @@ 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;
+}
+
+// Handles the braces [] of a field (e.g. value of 'name' attribute)
+function handleFieldWithBraces ($field) {
+	// Are there braces [] at the end?
+	if (substr($field, -2, 2) == '[]') {
+		// Try to find one and replace it. I do it this way to allow easy
+		// extending of this code.
+		foreach (array('admin_list_builder_id_value') as $key) {
+			// Is the cache entry set?
+			if (isset($GLOBALS[$key])) {
+				// Insert it
+				$field = str_replace('[]', '[' . $GLOBALS[$key] . ']', $field);
+
+				// And abort
+				break;
+			} // END - if
+		} // END - foreach
+	} // END - if
+
+	// Return it
+	return $field;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////