X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=254a29a17ef88d789297edfd803751925360f30c;hp=e0bee7f20cc894cd130df6c8081deb157cd1a9a1;hb=146d2e01f0ac11489e40a398dd79d5e3946f42ac;hpb=8cd3d68a23aa285f2fe149698a46cf8b4e3ac0ca

diff --git a/inc/functions.php b/inc/functions.php
index e0bee7f20c..254a29a17e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -45,7 +45,9 @@ if (!defined('__SECURITY')) {
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off
 function outputHtml ($htmlCode, $newLine = true) {
 	// Init output
-	if (!isset($GLOBALS['output'])) $GLOBALS['output'] = '';
+	if (!isset($GLOBALS['output'])) {
+		$GLOBALS['output'] = '';
+	} // END - if
 
 	// Transfer username
 	$username = getMessage('USERNAME_UNKNOWN');
@@ -83,7 +85,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
 			default:
 				// Huh, something goes wrong or maybe you have edited config.php ???
-				app_die(__FUNCTION__, __LINE__, '<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}');
+				debug_report_bug(__FUNCTION__, __LINE__, '<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}');
 				break;
 		} // END - switch
 	} elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
@@ -95,11 +97,6 @@ function outputHtml ($htmlCode, $newLine = true) {
 			clearOutputBuffer();
 		} // END - if
 
-		// Extension 'rewrite' installed?
-		if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
-			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
-		} // END - if
-
 		// Send all HTTP headers
 		sendHttpHeaders();
 
@@ -109,11 +106,6 @@ function outputHtml ($htmlCode, $newLine = true) {
 		// Output code here, DO NOT REMOVE! ;-)
 		outputRawCode($GLOBALS['output']);
 	} elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
-		// Rewrite links when rewrite extension is active
-		if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
-			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
-		} // END - if
-
 		// Send all HTTP headers
 		sendHttpHeaders();
 
@@ -155,21 +147,22 @@ function compileFinalOutput () {
 	addPageHeaderFooter();
 
 	// Compile all out
-	while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
+	while (((strpos($GLOBALS['output'], '{--') !== false) || (strpos($GLOBALS['output'], '{DQUOTE}') !== false) || (strpos($GLOBALS['output'], '{!') !== false) || (strpos($GLOBALS['output'], '{?') !== false) || (strpos($GLOBALS['output'], '{%') !== false)) && ($cnt < 3)) {
 		// Init common variables
 		$content = array();
 		$newContent = '';
 
 		// Compile it
 		//* DEBUG: */ print '<pre>'.htmlentities($GLOBALS['output']).'</pre>';
-		$eval = '$newContent = "' . compileCode(escapeQuotes($GLOBALS['output'])) . '";';
+		$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($GLOBALS['output']))) . '";';
 		//* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
 		eval($eval);
+		//* DEBUG: */ die('<pre>'.htmlentities($newContent).'</pre>');
 
 		// Was that eval okay?
 		if (empty($newContent)) {
 			// Something went wrong!
-			debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
+			debug_report_bug(__FUNCTION__, __LINE__, 'Evaluation error:<pre>' . linenumberCode($eval) . '</pre>', false);
 		} // END - if
 
 		// Use it again
@@ -179,6 +172,11 @@ function compileFinalOutput () {
 		$cnt++;
 	} // END - while
 
+	// Extension 'rewrite' installed?
+	if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+		$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
+	} // END - if
+
 	// Compress it?
 	if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
 		// Compress it for HTTP gzip
@@ -258,7 +256,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()) {
 	// @TODO Remove this sanity-check if all is fine
-	if (!is_bool($return)) debug_report_bug('return is not bool (' . gettype($return) . ')');
+	if (!is_bool($return)) debug_report_bug(__FUNCTION__, __LINE__, 'return is not bool (' . gettype($return) . ')');
 
 	// @TODO Try to rewrite all $DATA to $content
 	global $DATA;
@@ -326,9 +324,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
 
 			// Cache the eval() command here
 			$GLOBALS['template_eval'][$template] = $eval;
-
-			// Eval the code
-			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 />
@@ -343,10 +338,13 @@ function loadTemplate ($template, $return = false, $content = array()) {
 			// No file!
 			$GLOBALS['template_eval'][$template] = '404';
 		}
-	} else {
+	}
+
+	// Code set?
+	if ((isset($GLOBALS['template_eval'][$template])) && ($GLOBALS['template_eval'][$template] != '404')) {
 		// Eval the code
 		eval($GLOBALS['template_eval'][$template]);
-	}
+	} // END - if
 
 	// Do we have some content to output or return?
 	if (!empty($ret)) {
@@ -841,7 +839,7 @@ function translateGender ($gender) {
 		case 'C': $ret = getMessage('GENDER_C'); break;
 		default:
 			// Please report bugs on unknown genders
-			debug_report_bug(sprintf("Unknown gender %s detected.", $gender));
+			debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
 			break;
 	} // END - switch
 
@@ -866,7 +864,7 @@ function translateUserStatus ($status) {
 
 		default:
 			// Please report all unknown status
-			debug_report_bug(sprintf("Unknown status %s detected.", $status));
+			debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
 			break;
 	} // END - switch
 
@@ -956,7 +954,7 @@ function redirectToUrl ($URL, $allowSpider = true) {
 	} // END - if
 
 	// Three different ways to debug...
-	//* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+	//* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
 	//* DEBUG: */ die($URL);
 
@@ -995,7 +993,7 @@ function redirectToConfiguredUrl ($configEntry) {
 	// Is this URL set?
 	if (is_null($URL)) {
 		// Then abort here
-		debug_report_bug(sprintf("Configuration entry %s is not set!", $configEntry));
+		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry %s is not set!", $configEntry));
 	} // END - if
 
 	// Load the URL
@@ -1169,30 +1167,30 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 
 	if ($type == 'yn') {
 		// This is a yes/no selection only!
-		if ($id > 0) $prefix .= "[" . $id."]";
-		$OUT .= "    <select name=\"" . $prefix."\" class=\"" . $class . "\" size=\"1\">\n";
+		if ($id > 0) $prefix .= '[' . $id . ']';
+		$OUT .= '<select name="' . $prefix . '" class="' . $class . '" size="1">';
 	} else {
 		// Begin with regular selection box here
 		if (!empty($prefix)) $prefix .= "_";
 		$type2 = $type;
-		if ($id > 0) $type2 .= "[" . $id."]";
-		$OUT .= "    <select name=\"".strtolower($prefix . $type2)."\" class=\"" . $class . "\" size=\"1\">\n";
+		if ($id > 0) $type2 .= '[' . $id . ']';
+		$OUT .= '<select name="' . strtolower($prefix . $type2) . '" class="' . $class . '" size="1">';
 	}
 
 	switch ($type) {
 		case 'day': // Day
 			for ($idx = 1; $idx < 32; $idx++) {
-				$OUT .= "<option value=\"" . $idx."\"";
+				$OUT .= '<option value="' . $idx . '"';
 				if ($default == $idx) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
+				$OUT .= '>' . $idx . '</option>';
 			} // END - for
 			break;
 
 		case 'month': // Month
-			foreach ($GLOBALS['month_descr'] as $month => $descr) {
-				$OUT .= "<option value=\"" . $month."\"";
-				if ($default == $month) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $descr."</option>\n";
+			foreach ($GLOBALS['month_descr'] as $idx => $descr) {
+				$OUT .= '<option value="' . $idx . '"';
+				if ($default == $idx) $OUT .= ' selected="selected"';
+				$OUT .= '>' . $descr . '</option>';
 			} // END - for
 			break;
 
@@ -1215,19 +1213,18 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 			// Check if the default value is larger than minimum and bigger than actual year
 			if (($default > $minYear) && ($default >= $year)) {
 				for ($idx = $year; $idx < ($year + 11); $idx++) {
-					$OUT .= "<option value=\"" . $idx."\"";
+					$OUT .= '<option value="' . $idx . '"';
 					if ($default == $idx) $OUT .= ' selected="selected"';
-					$OUT .= ">" . $idx."</option>\n";
+					$OUT .= '>' . $idx . '</option>';
 				} // END - for
 			} elseif ($default == -1) {
 				// Current year minus 1
-				for ($idx = $startYear; $idx <= ($year + 1); $idx++)
-				{
-					$OUT .= "<option value=\"" . $idx."\">" . $idx."</option>\n";
-				}
+				for ($idx = $startYear; $idx <= ($year + 1); $idx++) {
+					$OUT .= '<option value="' . $idx . '">' . $idx . '</option>';
+				} // END - for
 			} else {
 				// Get current year and subtract the configured minimum age
-				$OUT .= "<option value=\"".($minYear - 1)."\">&lt;" . $minYear."</option>\n";
+				$OUT .= '<option value="' . ($minYear - 1) . '">&lt;' . $minYear . '</option>';
 				// Calculate earliest year depending on extension version
 				if (isExtensionInstalledAndNewer('order', '0.2.1')) {
 					// Use configured minimum age
@@ -1239,41 +1236,41 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 
 				// Construct year selection list
 				for ($idx = $minYear; $idx <= $year; $idx++) {
-					$OUT .= "<option value=\"" . $idx."\"";
+					$OUT .= '<option value="' . $idx . '"';
 					if ($default == $idx) $OUT .= ' selected="selected"';
-					$OUT .= ">" . $idx."</option>\n";
+					$OUT .= '>' . $idx . '</option>';
 				} // END - for
 			}
 			break;
 
 		case 'sec':
 		case 'min':
-			for ($idx = '0'; $idx < 60; $idx+=5) {
+			for ($idx = 0; $idx < 60; $idx+=5) {
 				if (strlen($idx) == 1) $idx = '0' . $idx;
-				$OUT .= "<option value=\"" . $idx."\"";
+				$OUT .= '<option value="' . $idx . '"';
 				if ($default == $idx) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
+				$OUT .= '>' . $idx . '</option>';
 			} // END - for
 			break;
 
 		case 'hour':
-			for ($idx = '0'; $idx < 24; $idx++) {
+			for ($idx = 0; $idx < 24; $idx++) {
 				if (strlen($idx) == 1) $idx = '0' . $idx;
-				$OUT .= "<option value=\"" . $idx."\"";
+				$OUT .= '<option value="' . $idx . '"';
 				if ($default == $idx) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
+				$OUT .= '>' . $idx . '</option>';
 			} // END - for
 			break;
 
 		case 'yn':
-			$OUT .= "<option value=\"Y\"";
+			$OUT .= '<option value="Y"';
 			if ($default == 'Y') $OUT .= ' selected="selected"';
-			$OUT .= ">{--YES--}</option>\n<option value=\"N\"";
+			$OUT .= '>{--YES--}</option><option value="N"';
 			if ($default != 'Y') $OUT .= ' selected="selected"';
-			$OUT .= ">{--NO--}</option>\n";
+			$OUT .= '>{--NO--}</option>';
 			break;
 	}
-	$OUT .= "    </select>\n";
+	$OUT .= '</select>';
 	return $OUT;
 }
 
@@ -1344,7 +1341,7 @@ function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
 	// Has the whole value changed?
 	if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true)) {
 		// Log the values
-		debug_report_bug('Problem with number found. ret=' . $ret . ', num='. $num);
+		debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret=' . $ret . ', num='. $num);
 	} // END - if
 
 	// Return result
@@ -1356,10 +1353,10 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 	// Is the code size oversized or shouldn't we display it?
 	if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == '0')) {
 		// Stop execution of function here because of over-sized code length
-		debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length'));
+		debug_report_bug(__FUNCTION__, __LINE__, '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" />';
 	}
 
 	// Load image
@@ -1372,8 +1369,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 	// Is it readable?
 	if (isFileReadable($img)) {
 		// Switch image type
-		switch (getConfig('img_type'))
-		{
+		switch (getConfig('img_type')) {
 			case 'jpg':
 				// Okay, load image and hide all errors
 				$image = imagecreatefromjpeg($img);
@@ -1383,7 +1379,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 				// Okay, load image and hide all errors
 				$image = imagecreatefrompng($img);
 				break;
-		}
+		} // END - switch
 	} else {
 		// Exit function here
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("File for image type %s not found.", getConfig('img_type')));
@@ -1403,7 +1399,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 	switch (getConfig('img_type')) {
 		case 'jpg': imagejpeg($image); break;
 		case 'png': imagepng($image);  break;
-	}
+	} // END - switch
 
 	// Remove image from memory
 	imagedestroy($image);
@@ -1477,137 +1473,137 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 		);
 	} else {
 		// Generate table
-		$OUT  = "<div align=\"" . $align."\">\n";
-		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"timebox_table dashed\">\n";
-		$OUT .= "<tr>\n";
+		$OUT  = '<div align="' . $align . '">';
+		$OUT .= '<table border="0" cellspacing="0" cellpadding="0" class="timebox_table dashed">';
+		$OUT .= '<tr>';
 
 		if (isInString('Y', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_YEARS--}</strong></td>';
+		} // END - if
 
 		if (isInString('M', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_MONTHS--}</strong></td>';
+		} // END - if
 
 		if (isInString('W', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_WEEKS--}</strong></td>';
+		} // END - if
 
 		if (isInString('D', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_DAYS--}</strong></td>';
+		} // END - if
 
 		if (isInString('h', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_HOURS--}</strong></td>';
+		} // END - if
 
 		if (isInString('m', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_MINUTES--}</strong></td>';
+		} // END - if
 
 		if (isInString('s', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
-		}
+			$OUT .= '<td align="center" class="timebox_column bottom"><div class="tiny">{--_SECONDS--}</strong></td>';
+		} // END - if
 
-		$OUT .= "</tr>\n";
-		$OUT .= "<tr>\n";
+		$OUT .= '</tr>';
+		$OUT .= '<tr>';
 
 		if (isInString('Y', $display) || (empty($display))) {
 			// Generate year selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ye\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 10; $idx++) {
-				$OUT .= "    <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_ye" size="1">';
+			for ($idx = 0; $idx <= 10; $idx++) {
+				$OUT .= '<option class="mini_select" value="' . $idx . '"';
 				if ($idx == $Y) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_ye" value="0" />';
 		}
 
 		if (isInString('M', $display) || (empty($display))) {
 			// Generate month selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mo\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 11; $idx++)
-			{
-				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_mo" size="1">';
+			for ($idx = 0; $idx <= 11; $idx++) {
+				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
 				if ($idx == $M) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_mo" value="0" />';
 		}
 
 		if (isInString('W', $display) || (empty($display))) {
 			// Generate week selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_we\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 4; $idx++) {
-				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_we" size="1">';
+			for ($idx = 0; $idx <= 4; $idx++) {
+				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
 				if ($idx == $W) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_we" value="0" />';
 		}
 
 		if (isInString('D', $display) || (empty($display))) {
 			// Generate day selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_da\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 31; $idx++) {
-				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_da" size="1">';
+			for ($idx = 0; $idx <= 31; $idx++) {
+				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
 				if ($idx == $D) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_da" value="0" />';
 		}
 
 		if (isInString('h', $display) || (empty($display))) {
 			// Generate hour selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_ho\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 23; $idx++) 	{
-				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_ho" size="1">';
+			for ($idx = 0; $idx <= 23; $idx++) {
+				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
 				if ($idx == $h) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_ho" value="0" />';
 		}
 
 		if (isInString('m', $display) || (empty($display))) {
 			// Generate minute selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_mi\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 59; $idx++) {
-				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_mi" size="1">';
+			for ($idx = 0; $idx <= 59; $idx++) {
+				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
 				if ($idx == $m) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_mi" value="0" />';
 		}
 
 		if (isInString('s', $display) || (empty($display))) {
 			// Generate second selection
-			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"" . $prefix . "_se\" size=\"1\">\n";
-			for ($idx = '0'; $idx <= 59; $idx++) {
-				$OUT .= "  <option class=\"mini_select\" value=\"" . $idx."\"";
+			$OUT .= '<td align="center"><select class="mini_select" name="' . $prefix . '_se" size="1">';
+			for ($idx = 0; $idx <= 59; $idx++) {
+				$OUT .= '  <option class="mini_select" value="' . $idx . '"';
 				if ($idx == $s) $OUT .= ' selected="selected"';
-				$OUT .= ">" . $idx."</option>\n";
-			}
-			$OUT .= "  </select></td>\n";
+				$OUT .= '>' . $idx . '</option>';
+			} // END - for
+			$OUT .= '</select></td>';
 		} else {
 			$OUT .= '<input type="hidden" name="' . $prefix . '_se" value="0" />';
 		}
-		$OUT .= "</tr>\n";
-		$OUT .= "</table>\n";
-		$OUT .= "</div>\n";
-		// Return generated HTML code
+		$OUT .= '</tr>';
+		$OUT .= '</table>';
+		$OUT .= '</div>';
 	}
+
+	// Return generated HTML code
 	return $OUT;
 }
 
@@ -1620,22 +1616,31 @@ function createTimestampFromSelections ($prefix, $postData) {
 	$SWITCH = '0';
 	$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');
+
 	// First add years...
 	$ret += $postData[$prefix . '_ye'] * (31536000 + $SWITCH);
+
 	// Next months...
 	$ret += $postData[$prefix . '_mo'] * 2628000;
+
 	// Next weeks
 	$ret += $postData[$prefix . '_we'] * 604800;
+
 	// Next days...
 	$ret += $postData[$prefix . '_da'] * 86400;
+
 	// Next hours...
 	$ret += $postData[$prefix . '_ho'] * 3600;
+
 	// Next minutes..
 	$ret += $postData[$prefix . '_mi'] * 60;
+
 	// And at last seconds...
 	$ret += $postData[$prefix . '_se'];
+
 	// Return calculated value
 	return $ret;
 }
@@ -1648,7 +1653,7 @@ function createFancyTime ($stamp) {
 	foreach($data as $k => $v) {
 		if ($v > 0) {
 			// Value is greater than 0 "eval" data to return string
-			eval("\$ret .= \", \".\$v.\" {--_".strtoupper($k)."--}\";");
+			eval('$ret .= ", ".$v." {--_' . strtoupper($k) . '--}";');
 			break;
 		} // END - if
 	} // END - foreach
@@ -1659,7 +1664,7 @@ function createFancyTime ($stamp) {
 		$ret = substr($ret, 2);
 	} else {
 		// Zero seconds
-		$ret = "0 {--_SECONDS--}";
+		$ret = '0 {--_SECONDS--}';
 	}
 
 	// Return fancy time string
@@ -1670,8 +1675,8 @@ function createFancyTime ($stamp) {
 function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) {
 	$TOP = '';
 	if ($show_form === false) {
-		$TOP = " top";
-	}
+		$TOP = ' top';
+	} // END - if
 
 	$NAV = '';
 	for ($page = 1; $page <= $PAGES; $page++) {
@@ -1699,7 +1704,10 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
 		}
 
 		// Add seperator if we have not yet reached total pages
-		if ($page < $PAGES) $NAV .= '&nbsp;|&nbsp;';
+		if ($page < $PAGES) {
+			// Add it
+			$NAV .= '|';
+		} // END - if
 	} // END - for
 
 	// Define constants only once
@@ -1738,7 +1746,7 @@ function extractHostnameFromUrl (&$script) {
 	if (isInString('/', $host)) $host = substr($host, 0, strpos($host, '/'));
 
 	// Generate relative URL
-	//* DEBUG: */ print("SCRIPT=" . $script.'<br />');
+	//* DEBUG: */ print('SCRIPT=' . $script.'<br />');
 	if (substr(strtolower($script), 0, 7) == 'http://') {
 		// But only if http:// is in front!
 		$script = substr($script, (strlen($url) + 7));
@@ -1747,7 +1755,7 @@ function extractHostnameFromUrl (&$script) {
 		$script = substr($script, (strlen($url) + 8));
 	}
 
-	//* DEBUG: */ print("SCRIPT=" . $script.'<br />');
+	//* DEBUG: */ print('SCRIPT=' . $script.'<br />');
 	if (substr($script, 0, 1) == '/') $script = substr($script, 1);
 
 	// Return host name
@@ -1861,7 +1869,7 @@ function sendRawRequest ($host, $request) {
 	$resolver = new HostnameResolver();
 
 	// Open connection
-	//* DEBUG: */ die("SCRIPT=" . $script.'<br />');
+	//* DEBUG: */ die('SCRIPT=' . $script.'<br />');
 	if ($useProxy === true) {
 		// Resolve hostname into IP address
 		$ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host')));
@@ -2066,13 +2074,13 @@ function isUrlValid ($URL, $compile=true) {
 // Generate a list of administrative links to a given userid
 function generateMemberAdminActionLinks ($userid, $status = '') {
 	// Make sure userid is a number
-	if ($userid != bigintval($userid)) debug_report_bug('userid is not a number!');
+	if ($userid != bigintval($userid)) debug_report_bug(__FUNCTION__, __LINE__, 'userid is not a number!');
 
 	// Define all main targets
 	$targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
 
 	// Begin of navigation links
-	$OUT = '[&nbsp;';
+	$OUT = '[';
 
 	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_';
@@ -2092,7 +2100,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
 			// All other status is fine
 			$OUT .= strtoupper($tar);
 		}
-		$OUT .= '--}</a></span>&nbsp;|&nbsp;';
+		$OUT .= '--}</a></span>|';
 	}
 
 	// Finish navigation link
@@ -2147,7 +2155,7 @@ function generateHash ($plainText, $salt = '', $hash = true) {
 	// Do we miss an arry element here?
 	if (!isConfigEntrySet('file_hash')) {
 		// Stop here
-		debug_report_bug('Missing file_hash in ' . __FUNCTION__ . '.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Missing file_hash in ' . __FUNCTION__ . '.');
 	} // END - if
 
 	// When the salt is empty build a new one, else use the first x configured characters as the salt
@@ -2220,7 +2228,7 @@ function scrambleString($str) {
 
 	// Scramble string here
 	//* DEBUG: */ outputHtml('***Original=' . $str.'***<br />');
-	for ($idx = '0'; $idx < strlen($str); $idx++) {
+	for ($idx = 0; $idx < strlen($str); $idx++) {
 		// Get char on scrambled position
 		$char = substr($str, $scrambleNums[$idx], 1);
 
@@ -2247,7 +2255,7 @@ function descrambleString($str) {
 	// Begin descrambling
 	$orig = str_repeat(' ', 40);
 	//* DEBUG: */ outputHtml('+++Scrambled=' . $str.'+++<br />');
-	for ($idx = '0'; $idx < 40; $idx++) {
+	for ($idx = 0; $idx < 40; $idx++) {
 		$char = substr($str, $idx, 1);
 		$orig = substr_replace($orig, $char, $scrambleNums[$idx], 1);
 	} // END - for
@@ -2263,7 +2271,7 @@ function genScrambleString ($len) {
 	$scrambleNumbers = array();
 
 	// First we need to setup randomized numbers from 0 to 31
-	for ($idx = '0'; $idx < $len; $idx++) {
+	for ($idx = 0; $idx < $len; $idx++) {
 		// Generate number
 		$rand = mt_rand(0, ($len -1));
 
@@ -2354,10 +2362,13 @@ function app_die ($F, $L, $message) {
 		loadIncludeOnce('inc/header.php');
 
 		// Rewrite message for output
-		$message = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $message);
+		$message = sprintf(getMessage('MAILER_HAS_DIED'), basename($F), $L, $message);
 
-		// Better log this message away
-		if ($F != 'debug_report_bug') logDebugMessage($F, $L, $message);
+		// We don't want to log messages from debug_report_bug() itself...
+		if ($F != 'debug_report_bug') {
+			// Better log this message away
+			logDebugMessage($F, $L, $message);
+		} // END - if
 
 		// Load the message template
 		loadTemplate('app_die_message', false, $message);
@@ -2366,12 +2377,12 @@ function app_die ($F, $L, $message) {
 		loadIncludeOnce('inc/footer.php');
 	} else {
 		// Script tried to kill itself twice
-		debug_report_bug('Script wanted to kill itself more than once! Raw message=' . $message . ', file/function=' . $F . ', line=' . $L);
+		die('['.__FUNCTION__.':'.__LINE__.']: Script wanted to kill itself more than once! Raw message=' . $message . ', file/function=' . $F . ', line=' . $L);
 	}
 }
 
 // Display parsing time and number of SQL queries in footer
-function displayParsingTime() {
+function displayParsingTime () {
 	// Is the timer started?
 	if (!isset($GLOBALS['startTime'])) {
 		// Abort here
@@ -2388,9 +2399,10 @@ function displayParsingTime() {
 	if ($runTime < 0) $runTime = '0';
 
 	// Prepare output
+	// @TODO This can be easily moved out after the merge from EL branch to this is complete
 	$content = array(
-		'runtime'  => translateComma($runTime),
-		'timeSQLs' => translateComma(getConfig('sql_time') * 1000),
+		'run_time' => translateComma($runTime),
+		'sql_time' => translateComma(getConfig('sql_time') * 1000),
 	);
 
 	// Load the template
@@ -2514,7 +2526,7 @@ function debug_get_mailable_backtrace () {
 }
 
 // Output a debug backtrace to the user
-function debug_report_bug ($message = '', $sendEmail = true) {
+function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
 	// Is this already called?
 	if (isset($GLOBALS[__FUNCTION__])) {
 		// Other backtrace
@@ -2537,7 +2549,7 @@ function debug_report_bug ($message = '', $sendEmail = true) {
 		);
 
 		// @TODO Add a little more infos here
-		logDebugMessage(__FUNCTION__, __LINE__, strip_tags($message));
+		logDebugMessage($F, $L, strip_tags($message));
 	} // END - if
 
 	// Add output
@@ -2559,7 +2571,7 @@ function debug_report_bug ($message = '', $sendEmail = true) {
 	} // END - if
 
 	// And abort here
-	app_die(__FUNCTION__, __LINE__, $debug);
+	app_die($F, $L, $debug);
 }
 
 // Generates a ***weak*** seed
@@ -2621,7 +2633,7 @@ function getMessageFromErrorCode ($code) {
 		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(getRequestParameter('id'))), __FILE__, __LINE__);
+				array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__);
 
 			// Load timestamp from last order
 			list($timestamp) = SQL_FETCHROW($result);
@@ -2843,8 +2855,8 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) {
 		// Remove CRLF
 		$message = str_replace("\r", '', str_replace("\n", '', $message));
 
-		// Log this message away, we better don't call app_die() here to prevent an endless loop
-		$fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or die(__FUNCTION__.'['.__LINE__.']: Cannot write logfile debug.log!');
+		// Log this message away
+		$fp = fopen(getConfig('CACHE_PATH') . 'debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write logfile debug.log!');
 		fwrite($fp, date('d.m.Y|H:i:s', time()) . '|' . getModule(false) . '|' . basename($funcFile) . '|' . $line . '|' . $message . "\n");
 		fclose($fp);
 	} // END - if
@@ -3138,10 +3150,10 @@ function shutdown () {
 	// Check if not in installation phase and the link is up
 	if ((!isInstallationPhase()) && (SQL_IS_LINK_UP())) {
 		// Close link
-		SQL_CLOSE(__FILE__, __LINE__);
+		SQL_CLOSE(__FUNCTION__, __LINE__);
 	} elseif (!isInstallationPhase()) {
 		// No database link
-		addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+		addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
 	}
 
 	// Stop executing here
@@ -3156,7 +3168,7 @@ function initMemberId () {
 // Setter for member id
 function setMemberId ($memberid) {
 	// We should not set member id to zero
-	if ($memberid == '0') debug_report_bug('Userid should not be set zero.');
+	if ($memberid == '0') debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
 
 	// Set it secured
 	$GLOBALS['member_id'] = bigintval($memberid);
@@ -3209,7 +3221,7 @@ function getExtraTitle () {
 	// Is the extra title set?
 	if (!isExtraTitleSet()) {
 		// No, then abort here
-		debug_report_bug('extra_title is not set!');
+		debug_report_bug(__FUNCTION__, __LINE__, 'extra_title is not set!');
 	} // END - if
 
 	// Return it
@@ -3251,12 +3263,12 @@ function generateExtensionNotInstalledMessage ($ext_name) {
 	} // END - if
 
 	// Default message
-	$message = getMaskedMessage('EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
+	$message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
 
 	// Is an admin logged in?
 	if (isAdmin()) {
 		// Then output admin message
-		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED', $ext_name);
+		$message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
 	} // END - if
 
 	// Return prepared message
@@ -3304,7 +3316,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 	$files = array();
 
 	// Open directory
-	$dirPointer = opendir(getConfig('PATH') . $baseDir) or app_die(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
+	$dirPointer = opendir(getConfig('PATH') . $baseDir) or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot read directory ' . basename($baseDir) . '.');
 
 	// Read all entries
 	while ($baseFile = readdir($dirPointer)) {
@@ -3378,7 +3390,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 				}
 			} else {
 				// We found .php file but should not search for them, why?
-				debug_report_bug('We should find files with extension=' . $extension . ', but we found a PHP script.');
+				debug_report_bug(__FUNCTION__, __LINE__, 'We should find files with extension=' . $extension . ', but we found a PHP script.');
 			}
 		} elseif (substr($baseFile, -4, 4) == $extension) {
 			// Other, generic file found
@@ -3457,7 +3469,7 @@ function initCacheInstance () {
 	$GLOBALS['cache_instance'] = new CacheSystem();
 	if ($GLOBALS['cache_instance']->getStatus() != 'done') {
 		// Failed to initialize cache sustem
-		addFatalMessage(__FILE__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_CANNOT_INITIALIZE'));
+		addFatalMessage(__FUNCTION__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_CANNOT_INITIALIZE'));
 	} // END - if
 }
 
@@ -3552,7 +3564,7 @@ function determinePageTitle () {
 		$pageTitle = getMessage('NO_CONFIG_FOUND_TITLE');
 
 		// Do not add the fatal message in installation mode
-		if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+		if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_CONFIG_FOUND'));
 	}
 
 	// Return title
@@ -3739,7 +3751,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent='') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
 	// Start the output
 	$OUT = '<select name="' . $name . '" size="1" class="admin_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
@@ -3749,7 +3761,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
 		// Add the <option> entry
 		if (empty($optionContent)) {
 			// ... from template
-			$OUT .= loadTemplate('select_' . $name . '_option', true, $option);
+			$OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
 		} else {
 			// Direct HTML code
 			$OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
@@ -3767,7 +3779,7 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
 	);
 
 	// Load template and return it
-	return loadTemplate('select_' . $name . '_box', true, $content);
+	return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
 }
 
 // Get a module from filename and access level
@@ -3788,7 +3800,7 @@ function getModuleFromFileName ($file, $accessLevel) {
 			break;
 
 		default: // Unsupported file name / access level
-			debug_report_bug('Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
+			debug_report_bug(__FUNCTION__, __LINE__, 'Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
 			break;
 	}