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

diff --git a/inc/functions.php b/inc/functions.php
index 25cb94adb1..7ed051a28a 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:
@@ -163,13 +163,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;
 
@@ -184,7 +184,7 @@ function compileFinalOutput () {
 // 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 +204,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);
@@ -218,7 +218,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
 
 	// 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 +237,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 +255,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 +276,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 +312,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,6 +345,60 @@ 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') {
 	global $DATA;
@@ -449,7 +448,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content).'<br />');
 	if (($UID > 0) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
-		if (isNicknameUsed($UID)) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($UID))) {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />");
 			// Load by nickname
 			fetchUserData($UID, 'nickname');
@@ -474,37 +473,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 $contentn, 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 +498,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);
@@ -536,6 +520,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	if (empty($newContent)) {
 		// Compiling failed
 		$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 +529,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 +538,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,17 +584,17 @@ 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)))) . '
+Headers : ' . str_replace('<', '&lt', str_replace('>', '&gt;', secureString(trim($mailHeader)))) . '
 To      : ' . $toEmail . '
 Subject : ' . $subject . '
 Message : ' . $message . '
@@ -630,7 +611,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 +620,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
@@ -875,7 +862,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 +872,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 +903,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 +927,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"';
@@ -970,6 +946,11 @@ function redirectToUrl ($URL) {
 		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)) {
 		// Secure the URL against bad things such als HTML insertions and so on...
@@ -978,8 +959,11 @@ function redirectToUrl ($URL) {
 		// Output new location link as anchor
 		outputHtml('<a href="' . $URL . '"' . $rel . '>' . $URL . '</a>');
 	} elseif (!headers_sent()) {
-		// Load URL when headers are not sent
 		//* DEBUG: */ debug_report_bug("URL={$URL}");
+		// Clear own output buffer
+		$GLOBALS['output'] = '';
+
+		// Load URL when headers are not sent
 		sendHeader('Location: '.str_replace('&amp;', '&', $URL));
 	} else {
 		// Output error message
@@ -1016,22 +1000,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 +1024,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 +1037,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 +1050,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 +1085,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 +1348,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
@@ -1474,35 +1457,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";
@@ -1518,7 +1501,7 @@ 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\" />\n";
 		}
 
 		if (ereg('M', $display) || (empty($display))) {
@@ -1532,10 +1515,10 @@ 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\" />\n";
 		}
 
-		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";
 			for ($idx = '0'; $idx <= 4; $idx++) {
@@ -1545,10 +1528,10 @@ 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\" />\n";
 		}
 
-		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";
 			for ($idx = '0'; $idx <= 31; $idx++) {
@@ -1558,10 +1541,10 @@ 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\" />\n";
 		}
 
-		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";
 			for ($idx = '0'; $idx <= 23; $idx++) 	{
@@ -1571,7 +1554,7 @@ 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\" />\n";
 		}
 
 		if (ereg('m', $display) || (empty($display))) {
@@ -1584,10 +1567,10 @@ 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\" />\n";
 		}
 
-		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";
 			for ($idx = '0'; $idx <= 59; $idx++) {
@@ -1597,7 +1580,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\" />\n";
 		}
 		$OUT .= "</tr>\n";
 		$OUT .= "</table>\n";
@@ -1666,7 +1649,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 +1661,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 +1723,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));
 	}
@@ -1987,7 +1970,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
 	$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_";
+		$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
@@ -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
@@ -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,32 @@ 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) {
+		// Prepare content
+		$content = array(
+			'message'     => trim($message),
+			'backtrace'   => trim(debug_get_mailable_backtrace()),
+			'request_uri' => trim(getRequestUri())
+		);
+
+		// 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);
 }
 
-// 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
@@ -2693,8 +2632,7 @@ function getMessageFromErrorCode ($code) {
 		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('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 = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break;
@@ -3186,7 +3124,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 +3141,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 +3150,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
@@ -3395,7 +3333,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 +3363,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 +3385,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 +3431,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!');
@@ -3630,10 +3572,10 @@ 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;
@@ -3676,7 +3618,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 +3633,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 +3645,232 @@ 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 ((($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?}')) {
+		// Add it
+		$url = '{?URL?}/' . $url;
+	} // END - if
+
+	// Return the URL
+	return $url;
+}
+
+// Simple check for spider
+function isSpider () {
+	// Is it a spider?
+	return ((strpos('spider', strtolower(detectUserAgent(true))) !== false) || (strpos('bot', strtolower(detectUserAgent(true))) !== false));
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
@@ -3718,7 +3886,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 +3906,7 @@ if (!function_exists('http_build_query')) {
 
 		return implode($sep, $ret);
 	}
-}// // END - if
+} // END - if
 
 // [EOF]
 ?>