X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=eb36b77d60840cef80982cc30d907c83fb9cbdd9;hp=25cb94adb14ee8db77fb50cc97c1c1f225f38b62;hb=0cbe2bfe902d26f0e99be6005140a9d8c350f017;hpb=735545e765720a954a345bc068239e2fffa0dbe1

diff --git a/inc/functions.php b/inc/functions.php
index 25cb94adb1..eb36b77d60 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 11/29/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
+ * ===================                          Last change: 11/29/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : functions.php                                    *
@@ -77,7 +77,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
 				// The same as above... ^
 				outputRawCode($htmlCode);
-				if ($newLine) print("\n");
+				if ($newLine === true) print("\n");
 				break;
 
 			default:
@@ -85,16 +85,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 				app_die(__FUNCTION__, __LINE__, '<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}');
 				break;
 		} // END - switch
-	} elseif ((getPhpCaching() == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
-		// Headers already sent?
-		if (headers_sent()) {
-			// Log this error
-			logDebugMessage(__FUNCTION__, __LINE__, 'Headers already sent! We need debug backtrace here.');
-
-			// Trigger an user error
-			debug_report_bug('Headers are already sent!');
-		} // END - if
-
+	} elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
 		// Output cached HTML code
 		$GLOBALS['output'] = ob_get_contents();
 
@@ -108,12 +99,12 @@ function outputHtml ($htmlCode, $newLine = true) {
 			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 		} // END - if
 
-		// Compile and run finished rendered HTML code
-		compileFinalOutput();
-
 		// Send all HTTP headers
 		sendHttpHeaders();
 
+		// Compile and run finished rendered HTML code
+		compileFinalOutput();
+
 		// Output code here, DO NOT REMOVE! ;-)
 		outputRawCode($GLOBALS['output']);
 	} elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
@@ -122,14 +113,17 @@ function outputHtml ($htmlCode, $newLine = true) {
 			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 		} // END - if
 
-		// Compile and run finished rendered HTML code
-		compileFinalOutput();
-
 		// Send all HTTP headers
 		sendHttpHeaders();
 
+		// Compile and run finished rendered HTML code
+		compileFinalOutput();
+
 		// Output code here, DO NOT REMOVE! ;-)
 		outputRawCode($GLOBALS['output']);
+	} else {
+		// And flush all headers
+		flushHeaders();
 	}
 }
 
@@ -142,7 +136,7 @@ function sendHttpHeaders () {
 	sendHeader('HTTP/1.1 200');
 
 	// General headers for no caching
-	sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21
+	sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21
 	sendHeader('Last-Modified: ' . $now);
 	sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 	sendHeader('Pragma: no-cache'); // HTTP/1.0
@@ -163,13 +157,13 @@ function compileFinalOutput () {
 		$newContent = '';
 
 		// Compile it
-		$eval = "\$newContent = \"".compileCode(addslashes($GLOBALS['output']))."\";";
+		$eval = "\$newContent = \"".compileCode(escapeQuotes($GLOBALS['output']))."\";";
 		eval($eval);
 
 		// Was that eval okay?
 		if (empty($newContent)) {
 			// Something went wrong!
-			debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>');
+			debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
 		} // END - if
 		$GLOBALS['output'] = $newContent;
 
@@ -177,14 +171,32 @@ function compileFinalOutput () {
 		$cnt++;
 	} // END - while
 
+	// Compress it?
+	if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
+		// Compress it for HTTP gzip
+		$GLOBALS['output'] = gzencode($GLOBALS['output'], 9, true);
+
+		// Add header
+		sendHeader('Content-Encoding: gzip');
+	} elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
+		// Compress it for HTTP deflate
+		$GLOBALS['output'] = gzcompress($GLOBALS['output'], 9);
+
+		// Add header
+		sendHeader('Content-Encoding: deflate');
+	}
+
 	// Add final length
 	sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
+
+	// Flush all headers
+	flushHeaders();
 }
 
 // Output the raw HTML code
 function outputRawCode ($htmlCode) {
 	// Output stripped HTML code to avoid broken JavaScript code, etc.
-	print($htmlCode);
+	print(str_replace('{BACK}', "\\", $htmlCode));
 
 	// Flush the output if only getPhpCaching() is not 'on'
 	if (getPhpCaching() != 'on') {
@@ -204,7 +216,7 @@ function getFatalArray () {
 }
 
 // Add a fatal error message to the queue array
-function addFatalMessage ($F, $L, $message, $extra='') {
+function addFatalMessage ($F, $L, $message, $extra = '') {
 	if (is_array($extra)) {
 		// Multiple extras for a message with masks
 		$message = call_user_func_array('sprintf', $extra);
@@ -217,8 +229,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
 	$GLOBALS['fatal_messages'][] = $message;
 
 	// Log fatal messages away
-	debug_report_bug($message);
-	logDebugMessage($F, $L, " message={$message}");
+	logDebugMessage($F, $L, 'Fatal error message: ' . $message);
 }
 
 // Getter for total fatal message count
@@ -237,7 +248,7 @@ function getTotalFatalErrors () {
 }
 
 // Load a template file and return it's content (only it's name; do not use ' or ")
-function loadTemplate ($template, $return=false, $content=array()) {
+function loadTemplate ($template, $return = false, $content = array()) {
 	// @TODO Remove this sanity-check if all is fine
 	if (!is_bool($return)) debug_report_bug('return is not bool (' . gettype($return) . ')');
 
@@ -255,73 +266,18 @@ function loadTemplate ($template, $return=false, $content=array()) {
 		// Make all template names lowercase
 		$template = strtolower($template);
 
-		// Count the template load
-		incrementConfigEntry('num_templates');
-
 		// Init some data
 		$ret = '';
 		if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0';
 
 		// Base directory
 		$basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage());
-		$mode = '';
-
-		// Check for admin/guest/member templates
-		if (substr($template, 0, 6) == 'admin_') {
-			// Admin template found
-			$mode = 'admin/';
-		} elseif (substr($template, 0, 6) == 'guest_') {
-			// Guest template found
-			$mode = 'guest/';
-		} elseif (substr($template, 0, 7) == 'member_') {
-			// Member template found
-			$mode = 'member/';
-		} elseif (substr($template, 0, 8) == 'install_') {
-			// Installation template found
-			$mode = 'install/';
-		} elseif (substr($template, 0, 4) == 'ext_') {
-			// Extension template found
-			$mode = 'ext/';
-		} elseif (substr($template, 0, 3) == 'la_') {
-			// 'Logical-area' template found
-			$mode = 'la/';
-		} elseif (substr($template, 0, 3) == 'js_') {
-			// JavaScript template found
-			$mode = 'js/';
-		} elseif (substr($template, 0, 5) == 'menu_') {
-			// Menu template found
-			$mode = 'menu/';
-		} else {
-			// Test for extension
-			$test = substr($template, 0, strpos($template, '_'));
-
-			// Probe for valid extension name
-			if (isExtensionNameValid($test)) {
-				// Set extra path to extension's name
-				$mode = $test . '/';
-			} // END - if
-		}
+		$extraPath = detectExtraTemplatePath($template);;
 
 		////////////////////////
 		// Generate file name //
 		////////////////////////
-		$FQFN = $basePath . $mode . $template . '.tpl';
-
-		if ((isWhatSet()) && ((strpos($template, '_header') > 0) || (strpos($template, '_footer') > 0)) && (($mode == 'guest/') || ($mode == 'member/') || ($mode == 'admin/'))) {
-			// Select what depended header/footer template file for admin/guest/member area
-			$file2 = sprintf("%s%s%s_%s.tpl",
-				$basePath,
-				$mode,
-				$template,
-				getWhat()
-			);
-
-			// Probe for it...
-			if (isFileReadable($file2)) $FQFN = $file2;
-
-			// Remove variable from memory
-			unset($file2);
-		} // END - if
+		$FQFN = $basePath . $extraPath . $template . '.tpl';
 
 		// Does the special template exists?
 		if (!isFileReadable($FQFN)) {
@@ -331,33 +287,33 @@ function loadTemplate ($template, $return=false, $content=array()) {
 
 		// Now does the final template exists?
 		if (isFileReadable($FQFN)) {
+			// Count the template load
+			incrementConfigEntry('num_templates');
+
 			// The local file does exists so we load it. :)
 			$GLOBALS['tpl_content'] = readFromFile($FQFN);
 
-			// Replace ' to our own chars to preventing them being quoted
-			while (strpos($GLOBALS['tpl_content'], "'") !== false) { $GLOBALS['tpl_content'] = str_replace("'", '{QUOT}', $GLOBALS['tpl_content']); }
-
 			// Do we have to compile the code?
 			$ret = '';
 			if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) {
 				// Normal HTML output?
 				if (getOutputMode() == '0') {
 					// Add surrounding HTML comments to help finding bugs faster
-					$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
+					$ret = '<!-- Template ' . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . " - End -->\n";
 
 					// Prepare eval() command
-					$eval = '$ret = "' . compileCode(addslashes($ret)) . '";';
+					$eval = '$ret = "' . compileCode(escapeQuotes($ret)) . '";';
 				} elseif (substr($template, 0, 3) == 'js_') {
 					// JavaScripts don't like entities and timings
-					$eval = '$ret = decodeEntities("' . compileRawCode(addslashes($GLOBALS['tpl_content'])) . '");';
+					$eval = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'])) . '");';
 				} else {
-					// Prepare eval() command
-					$eval = '$ret = "' . compileCode(addslashes($GLOBALS['tpl_content'])) . '";';
+					// Prepare eval() command, other output doesn't like entities, maybe
+					$eval = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
 				}
 			} else {
 				// Add surrounding HTML comments to help finding bugs faster
-				$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
-				$eval = '$ret = "' . addslashes($ret) . '";';
+				$ret = '<!-- Template ' . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . " - End -->\n";
+				$eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";';
 			} // END - if
 
 			// Cache the eval() command here
@@ -367,7 +323,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
 			eval($GLOBALS['template_eval'][$template]);
 		} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
 			// Only admins shall see this warning or when installation mode is active
-			$ret = '<br /><span class=\\"guest_failed\\">{--TEMPLATE_404--}</span><br />
+			$ret = '<br /><span class="guest_failed">{--TEMPLATE_404--}</span><br />
 (' . $template . ')<br />
 <br />
 {--TEMPLATE_CONTENT--}
@@ -400,8 +356,62 @@ function loadTemplate ($template, $return=false, $content=array()) {
 	}
 }
 
+// Detects the extra template path from given template name
+function detectExtraTemplatePath ($template) {
+	// Default is empty
+	$extraPath = '';
+
+	// Do we have cache?
+	if (!isset($GLOBALS['extra_path'][$template])) {
+		// Check for admin/guest/member/etc. templates
+		if (substr($template, 0, 6) == 'admin_') {
+			// Admin template found
+			$extraPath = 'admin/';
+		} elseif (substr($template, 0, 6) == 'guest_') {
+			// Guest template found
+			$extraPath = 'guest/';
+		} elseif (substr($template, 0, 7) == 'member_') {
+			// Member template found
+			$extraPath = 'member/';
+		} elseif (substr($template, 0, 7) == 'select_') {
+			// Selection template found
+			$extraPath = 'select/';
+		} elseif (substr($template, 0, 8) == 'install_') {
+			// Installation template found
+			$extraPath = 'install/';
+		} elseif (substr($template, 0, 4) == 'ext_') {
+			// Extension template found
+			$extraPath = 'ext/';
+		} elseif (substr($template, 0, 3) == 'la_') {
+			// 'Logical-area' template found
+			$extraPath = 'la/';
+		} elseif (substr($template, 0, 3) == 'js_') {
+			// JavaScript template found
+			$extraPath = 'js/';
+		} elseif (substr($template, 0, 5) == 'menu_') {
+			// Menu template found
+			$extraPath = 'menu/';
+		} else {
+			// Test for extension
+			$test = substr($template, 0, strpos($template, '_'));
+
+			// Probe for valid extension name
+			if (isExtensionNameValid($test)) {
+				// Set extra path to extension's name
+				$extraPath = $test . '/';
+			} // END - if
+		}
+
+		// Store it in cache
+		$GLOBALS['extra_path'][$template] = $extraPath;
+	} // END - if
+
+	// Return result
+	return $GLOBALS['extra_path'][$template];
+}
+
 // Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $UID = '0') {
+function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 	global $DATA;
 
 	// Make sure all template names are lowercase!
@@ -410,53 +420,36 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	// Default 'nickname' if extension is not installed
 	$nick = '---';
 
-	// Prepare IP number and User Agent
-	$REMOTE_ADDR     = detectRemoteAddr();
-	$HTTP_USER_AGENT = detectUserAgent();
-
-	// Default admin
-	$ADMIN = getConfig('MAIN_TITLE');
-
-	// Is the admin logged in?
-	if (isAdmin()) {
-		// Get admin id
-		$adminId = getCurrentAdminId();
-
-		// Load Admin data
-		$ADMIN = getAdminEmail($adminId);
-	} // END - if
-
 	// Neutral email address is default
 	$email = getConfig('WEBMASTER');
 
-	// Expiration in a nice output format
-	// NOTE: Use $content[expiration] in your templates instead of $EXPIRATION
-	if (getConfig('auto_purge') == '0') {
-		// Will never expire!
-		$EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
-	} else {
-		// Create nice date string
-		$EXPIRATION = createFancyTime(getConfig('auto_purge'));
-	}
-
 	// Is content an array?
 	if (is_array($content)) {
-		// Add expiration to array, $EXPIRATION is now deprecated!
-		$content['expiration'] = $EXPIRATION;
+		// Add expiration to array
+		if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) {
+			// Will never expire!
+			$content['expiration'] = getMessage('MAIL_WILL_NEVER_EXPIRE');
+		} elseif (isConfigEntrySet('auto_purge')) {
+			// Create nice date string
+			$content['expiration'] = createFancyTime(getConfig('auto_purge'));
+		} else {
+			// Missing entry
+			$content['expiration'] = getMessage('MAIL_NO_CONFIG_AUTO_PURGE');
+		}
 	} // END - if
 
 	// Load user's data
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content).'<br />');
-	if (($UID > 0) && (is_array($content))) {
+	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$userid},template={$template},content[]=".gettype($content).'<br />');
+	if (($userid > 0) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
-		if (isNicknameUsed($UID)) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />");
 			// Load by nickname
-			fetchUserData($UID, 'nickname');
+			fetchUserData($userid, 'nickname');
 		} else {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />");
 			/// Load by userid
-			fetchUserData($UID);
+			fetchUserData($userid);
 		}
 
 		// Merge data if valid
@@ -474,37 +467,22 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	if (isset($content['email'])) $email = $content['email'];
 
 	// Store email for some functions in global data array
+	// @TODO Do only use $content, not $DATA or raw variables
 	$DATA['email'] = $email;
 
 	// Base directory
 	$basePath = sprintf("%stemplates/%s/emails/", getConfig('PATH'), getLanguage());
 
-	// Check for admin/guest/member templates
-	if (substr($template, 0, 6) == 'admin_') {
-		// Admin template found
-		$FQFN = $basePath.'admin/' . $template.'.tpl';
-	} elseif (substr($template, 0, 6) == 'guest_') {
-		// Guest template found
-		$FQFN = $basePath.'guest/' . $template.'.tpl';
-	} elseif (substr($template, 0, 7) == 'member_') {
-		// Member template found
-		$FQFN = $basePath.'member/' . $template.'.tpl';
-	} else {
-		// Test for extension
-		$test = substr($template, 0, strpos($template, '_'));
-		if (isExtensionNameValid($test)) {
-			// Set extra path to extension's name
-			$FQFN = $basePath . $test.'/' . $template.'.tpl';
-		} else {
-			// No special filename
-			$FQFN = $basePath . $template.'.tpl';
-		}
-	}
+	// Detect extra path
+	$extraPath = detectExtraTemplatePath($template);
+
+	// Generate full FQFN
+	$FQFN = $basePath . $extraPath . $template . '.tpl';
 
 	// Does the special template exists?
 	if (!isFileReadable($FQFN)) {
 		// Reset to default template
-		$FQFN = $basePath . $template.'.tpl';
+		$FQFN = $basePath . $template . '.tpl';
 	} // END - if
 
 	// Now does the final template exists?
@@ -514,16 +492,16 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 		$GLOBALS['tpl_content'] = readFromFile($FQFN);
 
 		// Run code
-		$GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileRawCode(addslashes($GLOBALS['tpl_content']))."\");";
+		$GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileRawCode(escapeQuotes($GLOBALS['tpl_content']))."\");";
 		eval($GLOBALS['tpl_content']);
 	} elseif (!empty($template)) {
 		// Template file not found!
-		$newContent = "{--TEMPLATE_404--}: " . $template."<br />
+		$newContent = '{--TEMPLATE_404--}: ' . $template . '<br />
 {--TEMPLATE_CONTENT--}
-<pre>".print_r($content, true)."</pre>
+<pre>' . print_r($content, true) . '</pre>
 {--TEMPLATE_DATA--}
-<pre>".print_r($DATA, true)."</pre>
-<br /><br />";
+<pre>' . print_r($DATA, true) . '</pre>
+<br /><br />';
 
 		// Debug mode not active? Then remove the HTML tags
 		if (!isDebugModeEnabled()) $newContent = secureString($newContent);
@@ -535,7 +513,8 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	// Is there some content?
 	if (empty($newContent)) {
 		// Compiling failed
-		$newContent = "Compiler error for template {$template}!\nUncompiled content:\n" . $GLOBALS['tpl_content'];
+		$newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'];
+
 		// Add last error if the required function exists
 		if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
 	} // END - if
@@ -544,10 +523,6 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	unset($content);
 	unset($DATA);
 
-	// Compile the code and eval it
-	$eval = '$newContent = "' . compileRawCode(addslashes($newContent)) . '";';
-	eval($eval);
-
 	// Return content
 	return $newContent;
 }
@@ -557,7 +532,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$toEmail},SUBJECT={$subject}<br />");
 
 	// Compile subject line (for POINTS constant etc.)
-	eval("\$subject = decodeEntities(\"".compileRawCode(addslashes($subject))."\");");
+	eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");");
 
 	// Set from header
 	if ((!eregi('@', $toEmail)) && ($toEmail > 0)) {
@@ -603,20 +578,20 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	}
 
 	// Compile "TO"
-	eval("\$toEmail = \"".compileRawCode(addslashes($toEmail))."\";");
+	eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";");
 
 	// Compile "MSG"
-	eval("\$message = \"".compileRawCode(addslashes($message))."\";");
+	eval("\$message = \"".str_replace('$', '&#36;', compileRawCode(escapeQuotes($message)))."\";");
 
 	// Fix HTML parameter (default is no!)
 	if (empty($isHtml)) $isHtml = 'N';
 	if (isDebugModeEnabled()) {
 		// In debug mode we want to display the mail instead of sending it away so we can debug this part
 		outputHtml('<pre>
-Headers : ' . str_replace('<', '&lt', str_replace('>', '&gt;', htmlentities(trim($mailHeader)))) . '
-To      : ' . $toEmail . '
-Subject : ' . $subject . '
-Message : ' . $message . '
+Headers : ' . htmlentities(utf8_decode(trim($mailHeader))) . '
+To      : ' . htmlentities(utf8_decode($toEmail)) . '
+Subject : ' . htmlentities(utf8_decode($subject)) . '
+Message : ' . htmlentities(utf8_decode($message)) . '
 </pre>');
 	} elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
 		// Send mail as HTML away
@@ -630,7 +605,7 @@ Message : ' . $message . '
 	}
 }
 
-// Check if legacy or PHPMailer command
+// Check to use wether legacy mail() command or PHPMailer class
 // @TODO Rewrite this to an extension 'smtp'
 // @private
 function checkPhpMailerUsage() {
@@ -639,6 +614,12 @@ function checkPhpMailerUsage() {
 
 // Send out a raw email with PHPMailer class or legacy mail() command
 function sendRawEmail ($toEmail, $subject, $message, $from) {
+	// Just compile all again, to put out all configs, etc.
+	eval('$toEmail = decodeEntities("' . compileRawCode(escapeQuotes($toEmail)) . '");');
+	eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
+	eval('$message = decodeEntities("' . compileRawCode(escapeQuotes($message)) . '");');
+	eval('$from    = decodeEntities("' . compileRawCode(escapeQuotes($from))    . '");');
+
 	// Shall we use PHPMailer class or legacy mode?
 	if (checkPhpMailerUsage()) {
 		// Use PHPMailer class with SMTP enabled
@@ -771,7 +752,7 @@ function translateYesNo ($yn) {
 // Translates the "pool type" into human-readable
 function translatePoolType ($type) {
 	// Default?type is unknown
-	$translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
+	$translated = getMaskedMessage('POOL_TYPE_UNKNOWN', $type);
 
 	// Generate constant
 	$constName = sprintf("POOL_TYPE_%s", $type);
@@ -862,7 +843,7 @@ function translateUserStatus ($status) {
 
 		default:
 			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
-			$ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
+			$ret = getMaskedMessage('UNKNOWN_STATUS', $status);
 			break;
 	} // END - switch
 
@@ -875,7 +856,7 @@ function generateDerefererUrl ($URL) {
 	// Don't de-refer our own links!
 	if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) {
 		// De-refer this link
-		$URL = '{?URL?}/modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
+		$URL = '{%url=modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL)) . '%}';
 	} // END - if
 
 	// Return link
@@ -885,7 +866,7 @@ function generateDerefererUrl ($URL) {
 // Generates an URL for the frametester
 function generateFrametesterUrl ($URL) {
 	// Prepare frametester URL
-	$frametesterUrl = sprintf("{?URL?}/modules.php?module=frametester&amp;url=%s",
+	$frametesterUrl = sprintf("{%%url=modules.php?module=frametester&amp;url=%s%%}",
 		encodeString(compileUriCode($URL))
 	);
 
@@ -916,7 +897,7 @@ function countSelection ($array) {
 
 // Generate XHTML code for the CAPTCHA
 function generateCaptchaCode ($code, $type, $DATA, $userid) {
-	return '<img border="0" alt="Code ' . $code . '" src="{?URL?}/mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '" />';
+	return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '%}" />';
 }
 
 // Generates a timestamp (some wrapper for mktime())
@@ -940,18 +921,7 @@ function makeTime ($hours, $minutes, $seconds, $stamp) {
 // Redirects to an URL and if neccessarry extends it with own base URL
 function redirectToUrl ($URL) {
 	// Compile out codes
-	eval('$URL = "' . compileRawCode($URL) . '";');
-
-	// Check if http(s):// is there
-	if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) {
-		// Make all URLs full-qualified
-		$URL = getConfig('URL') . '/' . $URL;
-	} // END - if
-
-	// Three different debug ways...
-	//* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
-	//* DEBUG: */ die($URL);
+	eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";');
 
 	// Default 'rel' value is external, nofollow is evil from Google and hurts the Internet
 	$rel = ' rel="external"';
@@ -962,24 +932,23 @@ function redirectToUrl ($URL) {
 		$rel = '';
 	} // END - if
 
-	// Get output buffer
-	$GLOBALS['output'] = ob_get_contents();
-
-	// Clear it only if there is content
-	if (!empty($GLOBALS['output'])) {
-		clearOutputBuffer();
-	} // END - if
+	// Three different ways to debug...
+	//* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
+	//* DEBUG: */ die($URL);
 
 	// Simple probe for bots/spiders from search engines
-	if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
+	if (isSpider()) {
 		// Secure the URL against bad things such als HTML insertions and so on...
 		$URL = secureString($URL);
 
 		// Output new location link as anchor
 		outputHtml('<a href="' . $URL . '"' . $rel . '>' . $URL . '</a>');
 	} elseif (!headers_sent()) {
+		// Clear own output buffer
+		$GLOBALS['output'] = '';
+
 		// Load URL when headers are not sent
-		//* DEBUG: */ debug_report_bug("URL={$URL}");
 		sendHeader('Location: '.str_replace('&amp;', '&', $URL));
 	} else {
 		// Output error message
@@ -1016,22 +985,23 @@ function compileCode ($code, $simple = false, $constants = true, $full = true) {
 	} // END - if
 
 	// Start couting
-	$startCompile = explode(' ', microtime());
+	$startCompile = microtime(true);
 
 	// Comile the code
 	$code = compileRawCode($code, $simple, $constants, $full);
 
 	// Get timing
-	$compiled = explode(' ', microtime());
+	$compiled = microtime(true);
 
 	// Add timing
-	$code .= '<!-- Compilation time: ' . ((($compiled[1] + $compiled[0]) - ($startCompile[1] + $startCompile[0])) * 1000). 'ms //-->';
+	$code .= '<!-- Compilation time: ' . (($compiled - $startCompile) * 1000). 'ms //-->';
 
 	// Return compiled code
 	return $code;
 }
 
 // Compiles the code (use compileCode() only for HTML because of the comments)
+// @TODO $simple is deprecated
 function compileRawCode ($code, $simple = false, $constants = true, $full = true) {
 	// Is the code a string?
 	if (!is_string($code)) {
@@ -1039,11 +1009,11 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
 		return $code;
 	} // END - if
 
-	// Init replacement-array with full security characters
-	$secChars = $GLOBALS['security_chars'];
+	// Init replacement-array with smaller set of security characters
+	$secChars = $GLOBALS['url_chars'];
 
-	// Select smaller set of chars to replace when we e.g. want to compile URLs
-	if ($full === false) $secChars = $GLOBALS['url_chars'];
+	// Select full set of chars to replace when we e.g. want to compile URLs
+	if ($full === true) $secChars = $GLOBALS['security_chars'];
 
 	// Compile more through a filter
 	$code = runFilterChain('compile_code', $code);
@@ -1052,11 +1022,11 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
 	if ($constants === true) {
 		// BEFORE 0.2.1 : Language and data constants
 		// WITH 0.2.1+  : Only language constants
-		$code = str_replace('{--', "\".getMessage('", str_replace('--}', "').\"", $code));
+		$code = str_replace('{--', "\" . getMessage('", str_replace('--}', "') . \"", $code));
 
 		// BEFORE 0.2.1 : Not used
 		// WITH 0.2.1+  : Data constants
-		$code = str_replace('{!', "\".constant('", str_replace("!}", "').\"", $code));
+		$code = str_replace('{!', "\" . constant('", str_replace('!}', "') . \"", $code));
 	} // END - if
 
 	// Compile QUOT and other non-HTML codes
@@ -1065,10 +1035,8 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
 		$code = str_replace($to, $secChars['from'][$k], $code);
 	} // END - foreach
 
-	// But shall I keep simple quotes for later use?
-	if ($simple) $code = str_replace("'", '{QUOT}', $code);
-
 	// Find $content[bla][blub] entries
+	// @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 	preg_match_all('/\$(content|GLOBALS|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
 
 	// Are some matches found?
@@ -1102,13 +1070,13 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
 				// Replace it in the code
 				//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):key={$key},match={$match}<br />");
 				$newMatch = str_replace('[', "['", str_replace(']', "']", $match));
-				$code = str_replace($match, "\"." . $newMatch.".\"", $code);
+				$code = str_replace($match, '".' . $newMatch . '."', $code);
 				$matchesFound[$key . '_' . $matches[4][$key]] = 1;
 				$matchesFound[$match] = 1;
 			} elseif (!isset($matchesFound[$match])) {
 				// Not yet replaced!
 				//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):match={$match}<br />");
-				$code = str_replace($match, "\"." . $match.".\"", $code);
+				$code = str_replace($match, '".' . $match . '."', $code);
 				$matchesFound[$match] = 1;
 			}
 		} // END - foreach
@@ -1365,7 +1333,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 		debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length'));
 	} elseif ($headerSent === false) {
 		// Return an HTML code here
-		return "<img src=\"{?URL?}/img.php?code=" . $img_code."\" alt=\"Image\" />\n";
+		return "<img src=\"{%url=img.php?code=" . $img_code."%}\" alt=\"Image\" />\n";
 	}
 
 	// Load image
@@ -1416,6 +1384,16 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 }
 // Create selection box or array of splitted timestamp
 function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $return_array=false) {
+	// Do not continue if ONE_DAY is absend
+	if (!isConfigEntrySet('ONE_DAY')) {
+		// And return the timestamp itself or empty array
+		if ($return_array === true) {
+			return array();
+		} else {
+			return $timestamp;
+		}
+	} // END - if
+
 	// Calculate 2-seconds timestamp
 	$stamp = round($timestamp);
 	//* DEBUG: */ print("*" . $stamp.'/' . $timestamp."*<br />");
@@ -1474,35 +1452,35 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 	} else {
 		// Generate table
 		$OUT  = "<div align=\"" . $align."\">\n";
-		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
+		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"timebox_table dashed\">\n";
 		$OUT .= "<tr>\n";
 
 		if (ereg('Y', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
 		}
 
 		if (ereg('M', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
 		}
 
-		if (ereg("W", $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
+		if (ereg('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))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
+		if (ereg('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))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
+		if (ereg('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))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
 		}
 
-		if (ereg("s", $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
+		if (ereg('s', $display) || (empty($display))) {
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
 		}
 
 		$OUT .= "</tr>\n";
@@ -1510,7 +1488,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 
 		if (ereg('Y', $display) || (empty($display))) {
 			// Generate year selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_ye\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ye\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 10; $idx++) {
 				$OUT .= "    <option class=\"mini_select\" value=\"" . $idx."\"";
 				if ($idx == $Y) $OUT .= ' selected="selected"';
@@ -1518,12 +1496,12 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_ye\" value=\"0\" />\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_ye" value="0" />';
 		}
 
 		if (ereg('M', $display) || (empty($display))) {
 			// Generate month selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_mo\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mo\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 11; $idx++)
 			{
 				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
@@ -1532,12 +1510,12 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_mo\" value=\"0\" />\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_mo" value="0" />';
 		}
 
-		if (ereg("W", $display) || (empty($display))) {
+		if (ereg('W', $display) || (empty($display))) {
 			// Generate week selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_we\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_we\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 4; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
 				if ($idx == $W) $OUT .= ' selected="selected"';
@@ -1545,12 +1523,12 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_we\" value=\"0\" />\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_we" value="0" />';
 		}
 
-		if (ereg("D", $display) || (empty($display))) {
+		if (ereg('D', $display) || (empty($display))) {
 			// Generate day selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_da\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_da\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 31; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
 				if ($idx == $D) $OUT .= ' selected="selected"';
@@ -1558,12 +1536,12 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_da\" value=\"0\">\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_da" value="0" />';
 		}
 
-		if (ereg("h", $display) || (empty($display))) {
+		if (ereg('h', $display) || (empty($display))) {
 			// Generate hour selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_ho\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ho\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 23; $idx++) 	{
 				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
 				if ($idx == $h) $OUT .= ' selected="selected"';
@@ -1571,12 +1549,12 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_ho\" value=\"0\">\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_ho" value="0" />';
 		}
 
 		if (ereg('m', $display) || (empty($display))) {
 			// Generate minute selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_mi\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mi\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 59; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
 				if ($idx == $m) $OUT .= ' selected="selected"';
@@ -1584,12 +1562,12 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_mi\" value=\"0\">\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_mi" value="0" />';
 		}
 
-		if (ereg("s", $display) || (empty($display))) {
+		if (ereg('s', $display) || (empty($display))) {
 			// Generate second selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix."_se\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_se\" size=\"1\">\n";
 			for ($idx = '0'; $idx <= 59; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
 				if ($idx == $s) $OUT .= ' selected="selected"';
@@ -1597,7 +1575,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 			}
 			$OUT .= "  </select></td>\n";
 		} else {
-			$OUT .= "<INPUT type=\"hidden\" name=\"" . $prefix."_se\" value=\"0\">\n";
+			$OUT .= '<input type="hidden" name="' . $prefix . '_se" value="0" />';
 		}
 		$OUT .= "</tr>\n";
 		$OUT .= "</table>\n";
@@ -1617,21 +1595,21 @@ function createTimestampFromSelections ($prefix, $postData) {
 	$TEST = date('Y', time()) / 4;
 	$M1   = date('m', time());
 	// 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 = getConfig('ONE_DAY');
 	// First add years...
-	$ret += $postData[$prefix."_ye"] * (31536000 + $SWITCH);
+	$ret += $postData[$prefix . '_ye'] * (31536000 + $SWITCH);
 	// Next months...
-	$ret += $postData[$prefix."_mo"] * 2628000;
+	$ret += $postData[$prefix . '_mo'] * 2628000;
 	// Next weeks
-	$ret += $postData[$prefix."_we"] * 604800;
+	$ret += $postData[$prefix . '_we'] * 604800;
 	// Next days...
-	$ret += $postData[$prefix."_da"] * 86400;
+	$ret += $postData[$prefix . '_da'] * 86400;
 	// Next hours...
-	$ret += $postData[$prefix."_ho"] * 3600;
+	$ret += $postData[$prefix . '_ho'] * 3600;
 	// Next minutes..
-	$ret += $postData[$prefix."_mi"] * 60;
+	$ret += $postData[$prefix . '_mi'] * 60;
 	// And at last seconds...
-	$ret += $postData[$prefix."_se"];
+	$ret += $postData[$prefix . '_se'];
 	// Return calculated value
 	return $ret;
 }
@@ -1666,7 +1644,7 @@ function createFancyTime ($stamp) {
 function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) {
 	$SEP = ''; $TOP = '';
 	if ($show_form === false) {
-		$TOP = " top2";
+		$TOP = " top";
 		$SEP = "<tr><td colspan=\"" . $colspan."\" class=\"seperator\">&nbsp;</td></tr>";
 	}
 
@@ -1678,13 +1656,13 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
 			$NAV .= '<strong>-';
 		} else {
 			// Open anchor tag and add base URL
-			$NAV .= '<a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
+			$NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
 
 			// Add userid when we shall show all mails from a single member
 			if ((isGetRequestElementSet('userid')) && (bigintval(getRequestElement('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
 
 			// Close open anchor tag
-			$NAV .= '">';
+			$NAV .= '%}">';
 		}
 		$NAV .= $page;
 		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
@@ -1740,7 +1718,7 @@ function extractHostnameFromUrl (&$script) {
 	if (substr(strtolower($script), 0, 7) == 'http://') {
 		// But only if http:// is in front!
 		$script = substr($script, (strlen($url) + 7));
-	} elseif (substr(strtolower($script), 0, 8) == "https://") {
+	} elseif (substr(strtolower($script), 0, 8) == 'https://') {
 		// Does this work?!
 		$script = substr($script, (strlen($url) + 8));
 	}
@@ -1758,19 +1736,19 @@ function sendGetRequest ($script, $data = array()) {
 	$host = extractHostnameFromUrl($script);
 
 	// Add data
-	$scriptData = http_build_query($data, '', '&');
+	$body = http_build_query($data, '', '&');
 
 	// Do we have a question-mark in the script?
 	if (strpos($script, '?') === false) {
 		// No, so first char must be question mark
-		$scriptData = '?' . $scriptData;
+		$body = '?' . $body;
 	} else {
 		// Ok, add &
-		$scriptData = '&' . $scriptData;
+		$body = '&' . $body;
 	}
 
 	// Add script data
-	$script .= $scriptData;
+	$script .= $body;
 
 	// Generate GET request header
 	$request  = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
@@ -1781,8 +1759,11 @@ function sendGetRequest ($script, $data = array()) {
 	} else {
 		$request .= 'User-Agent: ' . getConfig('TITLE') . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
 	}
-	$request .= 'Content-Type: text/plain' . getConfig('HTTP_EOL');
+	$request .= 'Accept: text/plain;q=0.8' . 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: '.strlen($body) . getConfig('HTTP_EOL');
 	$request .= 'Connection: Close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
 
 	// Send the raw request
@@ -1805,18 +1786,17 @@ function sendPostRequest ($script, $postData) {
 	$host = extractHostnameFromUrl($script);
 
 	// Construct request
-	$data = http_build_query($postData, '', '&');
+	$body = http_build_query($postData, '', '&');
 
 	// Generate POST request header
 	$request  = 'POST /' . trim($script) . ' HTTP/1.1' . 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');
-	$request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL');
-	$request .= 'Content-length: ' . strlen($data) . getConfig('HTTP_EOL');
 	$request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
+	$request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL');
 	$request .= 'Connection: Close' . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
-	$request .= $data;
+	$request .= $body;
 
 	// Send the raw request
 	$response = sendRawRequest($host, $request);
@@ -1861,19 +1841,19 @@ 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');
+		$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');
+			$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>");
+		//* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
 
 		// Write request
 		fputs($fp, $proxyTunnel);
@@ -1920,7 +1900,7 @@ function sendRawRequest ($host, $request) {
 		}
 	} // END - foreach
 
-	//* DEBUG: */ print("<strong>Response:</strong><pre>".print_r($response, true)."</pre>");
+	//* DEBUG: */ print('<strong>Response:</strong><pre>'.print_r($response, true).'</pre>');
 
 	// Proxy agent found?
 	if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
@@ -1984,11 +1964,11 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
 	$targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
 
 	// Begin of navigation links
-	$OUT = "[&nbsp;";
+	$OUT = '[&nbsp;';
 
 	foreach ($targetArray as $tar) {
-		$OUT .= "<span class=\"admin_user_link\"><a href=\"{?URL?}/modules.php?module=admin&amp;what=" . $tar . "&amp;userid=" . $userid . "\" title=\"{--ADMIN_LINK_";
-		//* DEBUG: */ outputHtml("*" . $tar.'/' . $status."*<br />");
+		$OUT .= '<span class="admin_user_link"><a href="{%url=modules.php?module=admin&amp;what=' . $tar . '&amp;userid=' . $userid . '%}" title="{--ADMIN_LINK_';
+		//* DEBUG: */ outputHtml('*' . $tar.'/' . $status.'*<br />');
 		if (($tar == 'lock_user') && ($status == 'LOCKED')) {
 			// Locked accounts shall be unlocked
 			$OUT .= 'UNLOCK_USER';
@@ -1996,7 +1976,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
 			// All other status is fine
 			$OUT .= strtoupper($tar);
 		}
-		$OUT .= "_TITLE--}\">{--ADMIN_";
+		$OUT .= '_TITLE--}">{--ADMIN_';
 		if (($tar == 'lock_user') && ($status == 'LOCKED')) {
 			// Locked accounts shall be unlocked
 			$OUT .= 'UNLOCK_USER';
@@ -2004,7 +1984,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
 			// All other status is fine
 			$OUT .= strtoupper($tar);
 		}
-		$OUT .= "--}</a></span>&nbsp;|&nbsp;";
+		$OUT .= '--}</a></span>&nbsp;|&nbsp;';
 	}
 
 	// Finish navigation link
@@ -2068,15 +2048,15 @@ function generateHash ($plainText, $salt = '') {
 
 		// Generate SHA1 sum from modula of number and the prime number
 		$sha1 = sha1(($a % getConfig('_PRIME')) . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a);
-		//* DEBUG: */ outputHtml("SHA1=" . $sha1." (".strlen($sha1).")<br />");
+		//* DEBUG: */ outputHtml('SHA1=' . $sha1.' ('.strlen($sha1).')<br />');
 		$sha1 = scrambleString($sha1);
-		//* DEBUG: */ outputHtml("Scrambled=" . $sha1." (".strlen($sha1).")<br />");
+		//* DEBUG: */ outputHtml('Scrambled=' . $sha1.' ('.strlen($sha1).')<br />');
 		//* DEBUG: */ $sha1b = descrambleString($sha1);
-		//* DEBUG: */ outputHtml("Descrambled=" . $sha1b." (".strlen($sha1b).")<br />");
+		//* DEBUG: */ outputHtml('Descrambled=' . $sha1b.' ('.strlen($sha1b).')<br />');
 
 		// Generate the password salt string
 		$salt = substr($sha1, 0, getConfig('salt_length'));
-		//* DEBUG: */ outputHtml($salt." (".strlen($salt).")<br />");
+		//* DEBUG: */ outputHtml($salt.' ('.strlen($salt).')<br />');
 	} else {
 		// Use given salt
 		//* DEBUG: */ print 'salt=' . $salt . '<br />';
@@ -2111,8 +2091,11 @@ function scrambleString($str) {
 		$scrambleNums = explode(':', genScrambleString(strlen($str)));
 	}
 
+	// Compare both lengths and abort if different
+	if (strlen($str) != count($scrambleNums)) return $str;
+
 	// Scramble string here
-	//* DEBUG: */ outputHtml("***Original=" . $str."***<br />");
+	//* DEBUG: */ outputHtml('***Original=' . $str.'***<br />');
 	for ($idx = '0'; $idx < strlen($str); $idx++) {
 		// Get char on scrambled position
 		$char = substr($str, $scrambleNums[$idx], 1);
@@ -2122,7 +2105,7 @@ function scrambleString($str) {
 	} // END - for
 
 	// Return scrambled string
-	//* DEBUG: */ outputHtml("***Scrambled=" . $scrambled."***<br />");
+	//* DEBUG: */ outputHtml('***Scrambled=' . $scrambled.'***<br />');
 	return $scrambled;
 }
 
@@ -2139,14 +2122,14 @@ function descrambleString($str) {
 
 	// Begin descrambling
 	$orig = str_repeat(' ', 40);
-	//* DEBUG: */ outputHtml("+++Scrambled=" . $str."+++<br />");
+	//* DEBUG: */ outputHtml('+++Scrambled=' . $str.'+++<br />');
 	for ($idx = '0'; $idx < 40; $idx++) {
 		$char = substr($str, $idx, 1);
 		$orig = substr_replace($orig, $char, $scrambleNums[$idx], 1);
 	} // END - for
 
 	// Return scrambled string
-	//* DEBUG: */ outputHtml("+++Original=" . $orig."+++<br />");
+	//* DEBUG: */ outputHtml('+++Original=' . $orig.'+++<br />');
 	return $orig;
 }
 
@@ -2242,10 +2225,10 @@ function app_die ($F, $L, $message) {
 		$message = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $message);
 
 		// Better log this message away
-		logDebugMessage($F, $L, $message);
+		if ($F != 'debug_report_bug') logDebugMessage($F, $L, $message);
 
 		// Load the message template
-		loadTemplate('admin_settings_saved', false, $message);
+		loadTemplate('app_die_message', false, $message);
 
 		// Load footer
 		loadIncludeOnce('inc/footer.php');
@@ -2322,89 +2305,16 @@ function getCurrentTheme () {
 	// The default theme is 'default'... ;-)
 	$ret = 'default';
 
-	// Load default theme if not empty from configuration
-	if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme');
-
-	if (!isSessionVariableSet('mxchange_theme')) {
-		// Set default theme
-		setTheme($ret);
-	} elseif ((isSessionVariableSet('mxchange_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
-		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
-		// Get theme from cookie
-		$ret = getSession('mxchange_theme');
-
-		// Is it valid?
-		if (getThemeId($ret) == '0') {
-			// Fix it to default
-			$ret = 'default';
-		} // END - if
-	} elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
-		// Prepare FQFN for checking
-		$theme = sprintf("%stheme/%s/theme.php", getConfig('PATH'), getRequestElement('theme'));
-
-		// Installation mode active
-		if ((isGetRequestElementSet('theme')) && (isFileReadable($theme))) {
-			// Set cookie from URL data
-			setTheme(getRequestElement('theme'));
-		} elseif (isFileReadable(sprintf("%stheme/%s/theme.php", getConfig('PATH'), SQL_ESCAPE(postRequestElement('theme'))))) {
-			// Set cookie from posted data
-			setTheme(SQL_ESCAPE(postRequestElement('theme')));
-		}
-
-		// Set return value
-		$ret = getSession('mxchange_theme');
-	} else {
-		// Invalid design, reset cookie
-		setTheme($ret);
-	}
+	// Do we have ext-theme installed and active?
+	if (isExtensionActive('theme')) {
+		// Call inner method
+		$ret = getActualTheme();
+	} // END - if
 
 	// Return theme value
 	return $ret;
 }
 
-// Setter for theme in session
-function setTheme ($newTheme) {
-	setSession('mxchange_theme', $newTheme);
-}
-
-// Get id from theme
-// @TODO Try to move this to inc/libs/theme_functions.php
-function getThemeId ($name) {
-	// Is the extension 'theme' installed?
-	if (!isExtensionActive('theme')) {
-		// Then abort here
-		return 0;
-	} // END - if
-
-	// Default id
-	$id = '0';
-
-	// Is the cache entry there?
-	if (isset($GLOBALS['cache_array']['themes']['id'][$name])) {
-		// Get the version from cache
-		$id = $GLOBALS['cache_array']['themes']['id'][$name];
-
-		// Count up
-		incrementStatsEntry('cache_hits');
-	} elseif (getExtensionVersion('cache') != '0.1.8') {
-		// Check if current theme is already imported or not
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
-			array($name), __FUNCTION__, __LINE__);
-
-		// Entry found?
-		if (SQL_NUMROWS($result) == 1) {
-			// Fetch data
-			list($id) = SQL_FETCHROW($result);
-		} // END - if
-
-		// Free result
-		SQL_FREERESULT($result);
-	}
-
-	// Return id
-	return $id;
-}
-
 // Generates an error code from given account status
 function generateErrorCodeFromUserStatus ($status='') {
 	// If no status is provided, use the default, cached
@@ -2417,7 +2327,7 @@ function generateErrorCodeFromUserStatus ($status='') {
 	$errorCode = getCode('UNKNOWN_STATUS');
 
 	// Generate constant name
-	$codeName = sprintf("ID_%s", $status);
+	$codeName = sprintf("ACCOUNT_%s", strtoupper($status));
 
 	// Is the constant there?
 	if (isCodeSet($codeName)) {
@@ -2508,7 +2418,7 @@ function getActualVersion ($type = 'Revision') {
 					$new = true;
 				} else {
 					// Generate fake cache entry
-					foreach ($mapper as $map=>$idx) {
+					foreach ($mapper as $map => $idx) {
 						$GLOBALS['cache_array']['revision'][$map][0] = $ins_vers[$idx];
 					} // END - foreach
 
@@ -2630,8 +2540,26 @@ function debug_get_printable_backtrace () {
 	return $backtrace;
 }
 
+// A mail-able backtrace
+function debug_get_mailable_backtrace () {
+	// Init variable
+	$backtrace = '';
+
+	// Get and prepare backtrace for output
+	$backtraceArray = debug_backtrace();
+	foreach ($backtraceArray as $key => $trace) {
+		if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
+		if (!isset($trace['line'])) $trace['line'] = __LINE__;
+		if (!isset($trace['args'])) $trace['args'] = array();
+		$backtrace .= ($key+1) . '.:' . basename($trace['file']) . ':' . $trace['line'] . ', ' . $trace['function'] . '(' . count($trace['args']) . ")\n";
+	} // END - foreach
+
+	// Return the backtrace
+	return $backtrace;
+}
+
 // Output a debug backtrace to the user
-function debug_report_bug ($message = '') {
+function debug_report_bug ($message = '', $sendEmail = true) {
 	// Is this already called?
 	if (isset($GLOBALS[__FUNCTION__])) {
 		// Other backtrace
@@ -2658,21 +2586,30 @@ function debug_report_bug ($message = '') {
 	} // END - if
 
 	// Add output
-	$debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a> and include the logfile from <strong>" . getConfig('CACHE_PATH') . "debug.log</strong> in your report (you can now attach files):<pre>";
+	$debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">http://bugs.mxchange.org</a> and include the logfile from <strong>" . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . "debug.log</strong> in your report (you can now attach files):<pre>";
 	$debug .= debug_get_printable_backtrace();
 	$debug .= "</pre>\nRequest-URI: " . getRequestUri()."<br />\n";
 	$debug .= "Thank you for finding bugs.";
 
+	// Send an email? (e.g. not wanted for evaluation errors)
+	if (($sendEmail === true) && (!isInstallationPhase())) {
+		// Prepare content
+		$content = array(
+			'message'     => trim($message),
+			'backtrace'   => trim(debug_get_mailable_backtrace())
+		);
+
+		// Send email to webmaster
+		sendAdminNotification(getMessage('DEBUG_REPORT_BUG_SUBJECT'), 'admin_report_bug', $content);
+	} // END - if
+
 	// And abort here
-	// @TODO This cannot be rewritten to app_die(), try to find a solution for this.
-	die($debug);
+	app_die(__FUNCTION__, __LINE__, $debug);
 }
 
-// Generates a ***weak*** seed (taken from de.php.net/mt_srand)
+// Generates a ***weak*** seed
 function generateSeed () {
-	list($usec, $sec) = explode(' ', microtime());
-	$microTime = (((float)$sec + (float)$usec)) * 100000;
-	return $microTime;
+	return microtime(true) * 100000;
 }
 
 // Converts a message code to a human-readable message
@@ -2680,41 +2617,40 @@ function getMessageFromErrorCode ($code) {
 	$message = '';
 	switch ($code) {
 		case '': break;
-		case getCode('LOGOUT_DONE')      : $message = getMessage('LOGOUT_DONE'); break;
-		case getCode('LOGOUT_FAILED')    : $message = "<span class=\"guest_failed\">{--LOGOUT_FAILED--}</span>"; break;
-		case getCode('DATA_INVALID')     : $message = getMessage('MAIL_DATA_INVALID'); break;
-		case getCode('POSSIBLE_INVALID') : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
-		case getCode('ACCOUNT_LOCKED')   : $message = getMessage('MEMBER_ACCOUNT_LOCKED_UNC'); break;
-		case getCode('USER_404')         : $message = getMessage('USER_404'); break;
-		case getCode('STATS_404')        : $message = getMessage('MAIL_STATS_404'); break;
-		case getCode('ALREADY_CONFIRMED'): $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
-		case getCode('WRONG_PASS')       : $message = getMessage('LOGIN_WRONG_PASS'); break;
-		case getCode('WRONG_ID')         : $message = getMessage('LOGIN_WRONG_ID'); break;
-		case getCode('ID_LOCKED')        : $message = getMessage('LOGIN_ID_LOCKED'); break;
-		case getCode('ID_UNCONFIRMED')   : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break;
-		case getCode('ID_GUEST')         : $message = getMessage('LOGIN_ID_GUEST'); break;
-		case getCode('NO_COOKIES')       : $message = getMessage('LOGIN_NO_COOKIES'); break;
-		case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break;
-		case getCode('BEG_SAME_AS_OWN')  : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
-		case getCode('LOGIN_FAILED')     : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
-		case getCode('MODULE_MEM_ONLY')  : $message = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break;
-		case getCode('OVERLENGTH')       : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
-		case getCode('URL_FOUND')        : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
-		case getCode('SUBJ_URL')         : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
-		case getCode('BLIST_URL')        : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
-		case getCode('NO_RECS_LEFT')     : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
-		case getCode('INVALID_TAGS')     : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
-		case getCode('MORE_POINTS')      : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
-		case getCode('MORE_RECEIVERS1')  : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
-		case getCode('MORE_RECEIVERS2')  : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break;
-		case getCode('MORE_RECEIVERS3')  : $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min')); break;
-		case getCode('INVALID_URL')      : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break;
+		case getCode('LOGOUT_DONE')        : $message = getMessage('LOGOUT_DONE'); break;
+		case getCode('LOGOUT_FAILED')      : $message = '<span class="guest_failed">{--LOGOUT_FAILED--}</span>'; break;
+		case getCode('DATA_INVALID')       : $message = getMessage('MAIL_DATA_INVALID'); break;
+		case getCode('POSSIBLE_INVALID')   : $message = getMessage('MAIL_POSSIBLE_INVALID'); break;
+		case getCode('USER_404')           : $message = getMessage('USER_404'); break;
+		case getCode('STATS_404')          : $message = getMessage('MAIL_STATS_404'); break;
+		case getCode('ALREADY_CONFIRMED')  : $message = getMessage('MAIL_ALREADY_CONFIRMED'); break;
+		case getCode('WRONG_PASS')         : $message = getMessage('LOGIN_WRONG_PASS'); break;
+		case getCode('WRONG_ID')           : $message = getMessage('LOGIN_WRONG_ID'); break;
+		case getCode('ACCOUNT_LOCKED')     : $message = getMessage('LOGIN_STATUS_LOCKED'); break;
+		case getCode('ACCOUNT_UNCONFIRMED'): $message = getMessage('LOGIN_STATUS_UNCONFIRMED'); break;
+		case getCode('COOKIES_DISABLED')   : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
+		case getCode('BEG_SAME_AS_OWN')    : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
+		case getCode('LOGIN_FAILED')       : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
+		case getCode('MODULE_MEM_ONLY')    : $message = getMaskedMessage('MODULE_MEM_ONLY', getRequestElement('mod')); break;
+		case getCode('OVERLENGTH')         : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
+		case getCode('URL_FOUND')          : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
+		case getCode('SUBJ_URL')           : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
+		case getCode('BLIST_URL')          : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
+		case getCode('NO_RECS_LEFT')       : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
+		case getCode('INVALID_TAGS')       : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
+		case getCode('MORE_POINTS')        : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
+		case getCode('MORE_RECEIVERS1')    : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break;
+		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('UNKNOWN_ERROR')      : $message = getMessage('LOGIN_UNKNOWN_ERROR'); break;
+		case getCode('UNKNOWN_STATUS')     : $message = getMessage('LOGIN_UNKNOWN_STATUS'); break;
 
 		case getCode('ERROR_MAILID'):
 			if (isExtensionActive('mailid', true)) {
 				$message = getMessage('ERROR_CONFIRMING_MAIL');
 			} else {
-				$message = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
+				$message = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'mailid');
 			}
 			break;
 
@@ -2727,16 +2663,19 @@ function getMessageFromErrorCode ($code) {
 			break;
 
 		case getCode('URL_TLOCK'):
+			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
 			$result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
 				array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
 
 			// Load timestamp from last order
 			list($timestamp) = SQL_FETCHROW($result);
-			$timestamp = generateDateTime($timestamp, 1);
 
 			// Free memory
 			SQL_FREERESULT($result);
 
+			// Translate it for templates
+			$timestamp = generateDateTime($timestamp, 1);
+
 			// Calculate hours...
 			$STD = round(getConfig('url_tlock') / 60 / 60);
 
@@ -2755,7 +2694,7 @@ function getMessageFromErrorCode ($code) {
 
 		default:
 			// Missing/invalid code
-			$message = sprintf(getMessage('UNKNOWN_MAILID_CODE'), $code);
+			$message = getMaskedMessage('UNKNOWN_MAILID_CODE', $code);
 
 			// Log it
 			logDebugMessage(__FUNCTION__, __LINE__, $message);
@@ -2930,7 +2869,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 }
 // Send notification to admin
 function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') {
-	if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
+	if ((isExtensionInstalledAndNewer('admins', '0.4.1')) && (function_exists('sendAdminsEmails'))) {
 		// Send new way
 		sendAdminsEmails($subject, $templateName, $content, $userid);
 	} else {
@@ -3135,15 +3074,15 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 	if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode'];
 
 	// Generate receiver list
-	$RECEIVER = generateReceiverList($data['cat'], $data['receiver'], $mode);
+	$receiver = generateReceiverList($data['cat'], $data['receiver'], $mode);
 
 	// Receivers added?
-	if (!empty($RECEIVER)) {
+	if (!empty($receiver)) {
 		// Add bonus mail to queue
 		addBonusMailToQueue(
 		$data['subject'],
 		$data['text'],
-		$RECEIVER,
+		$receiver,
 		$data['points'],
 		$data['seconds'],
 		$data['url'],
@@ -3186,7 +3125,7 @@ function determineReferalId () {
 	} elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
 		// Set session refid als global
 		$GLOBALS['refid'] = bigintval(getSession('refid'));
-	} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid')) == 'Y') {
+	} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y')) {
 		// Select a random user which has confirmed enougth mails
 		$GLOBALS['refid'] = determineRandomReferalId();
 	} elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) {
@@ -3203,7 +3142,7 @@ function determineReferalId () {
 		$found = false;
 
 		// Do we have nickname or userid set?
-		if (isNicknameUsed($GLOBALS['refid'])) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($GLOBALS['refid']))) {
 			// Nickname in URL, so load the id
 			$found = fetchUserData($GLOBALS['refid'], 'nickname');
 		} elseif ($GLOBALS['refid'] > 0) {
@@ -3212,7 +3151,7 @@ function determineReferalId () {
 		}
 
 		// Is the record valid?
-		if (($found === false) || (!isUserDataValid())) {
+		if ((($found === false) || (!isUserDataValid())) && (isConfigEntrySet('def_refid'))) {
 			// No, then reset referal id
 			$GLOBALS['refid'] = getConfig('def_refid');
 		} // END - if
@@ -3239,7 +3178,8 @@ function shutdown () {
 	// Call the filter chain 'shutdown'
 	runFilterChain('shutdown', null);
 
-	if (SQL_IS_LINK_UP()) {
+	// Check if not in installation phase and the link is up
+	if ((!isInstallationPhase()) && (SQL_IS_LINK_UP())) {
 		// Close link
 		SQL_CLOSE(__FILE__, __LINE__);
 	} elseif (!isInstallationPhase()) {
@@ -3333,12 +3273,12 @@ function generateExtensionInactiveMessage ($ext_name) {
 	} // END - if
 
 	// Default message
-	$message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+	$message = getMaskedMessage('EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
 
 	// Is an admin logged in?
 	if (isAdmin()) {
 		// Then output admin message
-		$message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE'), $ext_name);
+		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE', $ext_name);
 	} // END - if
 
 	// Return prepared message
@@ -3354,12 +3294,12 @@ function generateExtensionNotInstalledMessage ($ext_name) {
 	} // END - if
 
 	// Default message
-	$message = sprintf(getMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+	$message = getMaskedMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
 
 	// Is an admin logged in?
 	if (isAdmin()) {
 		// Then output admin message
-		$message = sprintf(getMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED'), $ext_name);
+		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
 	} // END - if
 
 	// Return prepared message
@@ -3395,7 +3335,7 @@ function generateExtensionInactiveNotInstalledMessage ($ext_name) {
 // Reads a directory recursively by default and searches for files not matching
 // an exclusion pattern. You can now keep the exclusion pattern empty for reading
 // a whole directory.
-function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true) {
+function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $addBaseDir = true, $excludeArray = array(), $extension = '.php', $excludePattern = '@(\.|\.\.)$@', $recursive = true, $suffix = '') {
 	// Add default entries we should exclude
 	$excludeArray[] = '.';
 	$excludeArray[] = '..';
@@ -3425,7 +3365,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 		// Remove double slashes
 		$FQFN = str_replace('//', '/', $FQFN);
 
-		// Check if the base filename matches an exclusion pattern and if the pattern is not empty
+		// Check if the base filenname matches an exclusion pattern and if the pattern is not empty
 		if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) {
 			// These Lines are only for debugging!!
 			//* DEBUG: */ outputHtml('baseDir:' . $baseDir . '<br />');
@@ -3447,6 +3387,10 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 			// Skip this file
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid prefix in file " . $baseFile . ", prefix=" . $prefix);
 			continue;
+		} elseif ((!empty($suffix)) && (substr($baseFile, -(strlen($suffix . $extension)), (strlen($suffix . $extension))) != $suffix . $extension)) {
+			// Skip wrong suffix as well
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Invalid suffix in file " . $baseFile . ", suffix=" . $suffix);
+			continue;
 		} elseif (!isFileReadable($FQFN)) {
 			// Not readable so skip it
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "File " . $FQFN . " is not readable!");
@@ -3489,7 +3433,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 	closedir($dirPointer);
 
 	// Sort array
-	asort($files);
+	sort($files);
 
 	// Return array with include files
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
@@ -3610,7 +3554,7 @@ function determinePageTitle () {
 		$TITLE = '';
 
 		// Title decoration enabled?
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." ";
+		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left')) . ' ';
 
 		// Do we have some extra title?
 		if (isExtraTitleSet()) {
@@ -3630,19 +3574,19 @@ function determinePageTitle () {
 		$mode = '';
 		if (getModule() == 'login') $mode = 'member';
 		elseif (getModule() == 'index') $mode = 'guest';
-		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, getWhat());
+		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu($mode, getWhat());
 
 		// Add title decorations? (right)
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= " ".trim(getConfig('title_right'));
+		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= ' ' . trim(getConfig('title_right'));
 
 		// Remember title in constant for the template
 		$pageTitle = $TITLE;
 	} elseif ((isInstalled()) && (isAdminRegistered())) {
 		// Installed, admin registered but no ext-sql_patches
-		$pageTitle = '[-- ' . getConfig('MAIN_TITLE').' - '.getModuleTitle(getModule()) . ' --]';
+		$pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]';
 	} elseif ((isInstalled()) && (!isAdminRegistered())) {
 		// Installed but no admin registered
-		$pageTitle = sprintf(getMessage('SETUP_OF_MXCHANGE'), getConfig('MAIN_TITLE'));
+		$pageTitle = getMessage('SETUP_OF_MXCHANGE');
 	} elseif ((!isInstalled()) || (!isAdminRegistered())) {
 		// Installation mode
 		$pageTitle = getMessage('INSTALLATION_OF_MXCHANGE');
@@ -3655,7 +3599,7 @@ function determinePageTitle () {
 	}
 
 	// Return title
-	return $pageTitle;
+	return decodeEntities($pageTitle);
 }
 
 // Checks wethere there is a cache file there. This function is cached.
@@ -3676,7 +3620,7 @@ function isTemplateCached ($template) {
 // Flushes non-flushed template cache to disk
 function flushTemplateCache ($template, $eval) {
 	// Is this cache flushed?
-	if ((!isTemplateCached($template)) && ($eval != '404')) {
+	if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template) === false) && ($eval != '404')) {
 		// Generate FQFN
 		$FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
 
@@ -3691,7 +3635,7 @@ function flushTemplateCache ($template, $eval) {
 // Reads a template cache
 function readTemplateCache ($template) {
 	// Check it again
-	if (isTemplateCached($template)) {
+	if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) {
 		// Generate FQFN
 		$FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
 
@@ -3703,6 +3647,238 @@ function readTemplateCache ($template) {
 	return $GLOBALS['template_eval'][$template];
 }
 
+// Escapes quotes (default is only double-quotes)
+function escapeQuotes ($str, $single = false) {
+	// Should we escape all?
+	if ($single === true) {
+		// Escape all (including null)
+		$str = addslashes($str);
+	} else {
+		// Escape only double-quotes but prevent double-quoting
+		$str = str_replace("\\\\", "\\", str_replace('"', "\\\"", $str));
+	}
+
+	// Return the escaped string
+	return $str;
+}
+
+// Escapes the JavaScript code, prevents \r and \n becoming char 10/13
+function escapeJavaScriptQuotes ($str) {
+	// Replace all double-quotes and secure back-ticks
+	$str = str_replace('"', '\"', str_replace("\\", '{BACK}', $str));
+
+	// Return it
+	return $str;
+}
+
+// Send out mails depending on the 'mod/modes' combination
+// @TODO Lame description for this function
+function sendModeMails ($mod, $modes) {
+	// Load hash
+	if (fetchUserData(getMemberId())) {
+		// Extract salt from cookie
+		$salt = substr(getSession('u_hash'), 0, -40);
+
+		// Now let's compare passwords
+		$hash = generatePassString(getUserData('password'));
+
+		// Does the hash match or should we change it?
+		if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
+			// Load the data
+			$content = getUserDataArray();
+
+			// Translate gender
+			$content['gender'] = translateGender($content['gender']);
+
+			// Clear/init the content variable
+			$content['message'] = '';
+
+			// Which mail?
+			// @TODO Move this in a filter
+			switch ($mod) {
+				case 'mydata':
+					foreach ($modes as $mode) {
+						switch ($mode) {
+							case 'normal': break; // Do not add any special lines
+							case 'email': // Email was changed!
+								$content['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestElement('old_email')."\n";
+								break;
+
+							case 'pass': // Password was changed
+								$content['message'] = getMessage('MEMBER_CHANGED_PASS')."\n";
+								break;
+
+							default:
+								logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
+								$content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n";
+								break;
+						} // END - switch
+					} // END - foreach
+
+					if (isExtensionActive('country')) {
+						// Replace code with description
+						$content['country'] = generateCountryInfo(postRequestElement('country_code'));
+					} // END - if
+
+					// Merge content with data from POST
+					$content = merge_array($content, postRequestArray());
+
+					// Load template
+					$message = loadEmailTemplate('member_mydata_notify', $content, getMemberId());
+
+					if (getConfig('admin_notify') == 'Y') {
+						// The admin needs to be notified about a profile change
+						$message_admin = 'admin_mydata_notify';
+						$sub_adm   = getMessage('ADMIN_CHANGED_DATA');
+					} else {
+						// No mail to admin
+						$message_admin = '';
+						$sub_adm   = '';
+					}
+
+					// Set subject lines
+					$sub_mem = getMessage('MEMBER_CHANGED_DATA');
+
+					// Output success message
+					$content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
+					break;
+
+				default: // Unsupported module!
+					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
+					$content = "<span class=\"member_failed\">{--UNKNOWN_MODULE--}</span>";
+					break;
+			} // END - switch
+		} else {
+			// Passwords mismatch
+			$content = "<span class=\"member_failed\">{--MEMBER_PASSWORD_ERROR--}</span>";
+		}
+	} else {
+		// Could not load profile
+		$content = "<span class=\"member_failed\">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>";
+	}
+
+	// Send email to user if required
+	if ((!empty($sub_mem)) && (!empty($message))) {
+		// Send member mail
+		sendEmail($content['email'], $sub_mem, $message);
+	} // END - if
+
+	// Send only if no other error has occured
+	if (empty($content)) {
+		if ((!empty($sub_adm)) && (!empty($message_admin))) {
+			// Send admin mail
+			sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
+		} elseif (getConfig('admin_notify') == 'Y') {
+			// Cannot send mails to admin!
+			$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
+		} else {
+			// No mail to admin
+			$content = "<span class=\"member_done\">{--MYDATA_MAIL_SENT--}</span>";
+		}
+	} // END - if
+
+	// Load template
+	loadTemplate('admin_settings_saved', false, $content);
+}
+
+// Generates a 'selection box' from given array
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent) {
+	// Start the output
+	$OUT = '<select name="' . $name . '" size="1" class="admin_select">
+<option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
+
+	// Walk through all options
+	foreach ($options as $option) {
+		// Add the <option> entry
+		$OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
+	} // END - foreach
+
+	// Finish selection box
+	$OUT .= '</select>';
+
+	// Prepare output
+	$content = array(
+		'selection_box' => $OUT,
+		'module'        => getModule(),
+		'what'          => getWhat()
+	);
+
+	// Load template and return it
+	return loadTemplate('select_' . $name . '_box', true, $content);
+}
+
+// Get a module from filename and access level
+function getModuleFromFileName ($file, $accessLevel) {
+	// Default is 'invalid';
+	$modCheck = 'invalid';
+
+	// @TODO This is still very static, rewrite it somehow
+	switch ($accessLevel) {
+		case 'admin':
+			$modCheck = 'admin';
+			break;
+
+		case 'sponsor':
+		case 'guest':
+		case 'member':
+			$modCheck = getModule();
+			break;
+
+		default: // Unsupported file name / access level
+			debug_report_bug('Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
+			break;
+	}
+
+	// Return result
+	return $modCheck;
+}
+
+// Encodes an URL for adding session id, etc.
+function encodeUrl ($url, $outputMode = '0') {
+	// Do we have already have a PHPSESSID inside? Then it is already converted...
+	if (strpos($url, session_name()) !== false) return $url;
+
+	// Do we have a valid session?
+	if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
+		// Invalid session
+		// Determine right seperator
+		$seperator = '&amp;';
+		if (strpos($url, '?') === false) {
+			// No question mark
+			$seperator = '?';
+		} elseif ((getOutputMode() != '0') || ($outputMode != '0')) {
+			// Non-HTML mode
+			$seperator = '&';
+		}
+
+		// Add it to URL
+		if (session_id() != '') {
+			$url .= $seperator . session_name() . '=' . session_id();
+		} // END - if
+	} // END - if
+
+	// Add {?URL?} ?
+	if ((substr($url, 0, strlen(getConfig('URL'))) != getConfig('URL')) && (substr($url, 0, 7) != '{?URL?}') && (substr($url, 0, 7) != 'http://') && (substr($url, 0, 8) != 'https://')) {
+		// Add it
+		$url = '{?URL?}/' . $url;
+	} // END - if
+
+	// Return the URL
+	return $url;
+}
+
+// Simple check for spider
+function isSpider () {
+	// Get the UA
+	$userAgent = strtolower(detectUserAgent(true));
+
+	// It should not be empty, if so it is better a spider/bot
+	if (empty($userAgent)) return true;
+
+	// Is it a spider?
+	return ((strpos($userAgent, 'spider') !== false) || (strpos($userAgent, 'slurp') !== false) || (strpos($userAgent, 'bot') !== false));
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
@@ -3718,7 +3894,7 @@ if (!function_exists('html_entity_decode')) {
 
 if (!function_exists('http_build_query')) {
 	// Taken from documentation on www.php.net, credits to Marco K. (Germany)
-	function http_build_query($data, $prefix='', $sep='', $key='') {
+	function http_build_query($data, $prefix = '', $sep = '', $key = '') {
 		$ret = array();
 		foreach ((array)$data as $k => $v) {
 			if (is_int($k) && $prefix != null) {
@@ -3738,7 +3914,7 @@ if (!function_exists('http_build_query')) {
 
 		return implode($sep, $ret);
 	}
-}// // END - if
+} // END - if
 
 // [EOF]
 ?>