X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=57e2c1036496f8d6305bdaeabc192e9770edb98b;hp=60efa3138edc088eca19193615a0e0b88586f5fa;hb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;hpb=f1308369312b448023e572dc12dec0da6a9b5e52

diff --git a/inc/functions.php b/inc/functions.php
index 60efa3138e..57e2c10364 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -44,7 +44,8 @@ if (!defined('__SECURITY')) {
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off
 function outputHtml ($htmlCode, $newLine = true) {
 	// Transfer username
-	$username = getUsername();
+	$username = getMessage('USERNAME_UNKNOWN');
+	if (isset($GLOBALS['username'])) $username = getUsername();
 
 	// Do we have HTML-Code here?
 	if (!empty($htmlCode)) {
@@ -115,7 +116,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 		sendHeader('Content-language: ' . getLanguage());
 
 		// Extension 'rewrite' installed?
-		if ((isExtensionActive('rewrite')) && (getOutputMode() != '1')) {
+		if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
 			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 		} // END - if
 
@@ -123,7 +124,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 		$cnt = 0;
 
 		// Compile and run finished rendered HTML code
-		while (((strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) {
+		while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) {
 			// Prepare the content and eval() it...
 			$content = array();
 			$newContent = '';
@@ -135,7 +136,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 			// Was that eval okay?
 			if (empty($newContent)) {
 				// Something went wrong!
-				debug_report_bug('Evaluation error:<pre>' . htmlentities($eval) . '</pre>');
+				debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>');
 			} // END - if
 			$GLOBALS['output'] = $newContent;
 
@@ -147,7 +148,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 		outputRawCode($GLOBALS['output']);
 	} elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
 		// Rewrite links when rewrite extension is active
-		if ((isExtensionActive('rewrite')) && (getOutputMode() != '1')) {
+		if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
 			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 		} // END - if
 
@@ -197,6 +198,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
 	$GLOBALS['fatal_messages'][] = $message;
 
 	// Log fatal messages away
+	debug_report_bug($message);
 	logDebugMessage($F, $L, " message={$message}");
 }
 
@@ -239,7 +241,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
 		if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
 
 		// Generate date/time string
-		$date_time = generateDateTime(time(), '1');
+		$date_time = generateDateTime(time(), 1);
 
 		// Is content an array
 		if (is_array($content)) $content['date_time'] = $date_time;
@@ -362,8 +364,9 @@ function loadTemplate ($template, $return=false, $content=array()) {
 					$eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";';
 				}
 			} else {
-				// Simply return loaded code
-				$eval = '$ret = $GLOBALS[\'tpl_content\'];';
+				// Add surrounding HTML comments to help finding bugs faster
+				$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
+				$eval = '$ret = "' . smartAddSlashes($ret) . '";';
 			} // END - if
 
 			// Cache the eval() command here
@@ -407,7 +410,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
 }
 
 // Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $UID = '0') {
+function loadEmailTemplate ($template, $content = array(), $UID = 0) {
 	global $DATA;
 
 	// Our configuration is kept non-global here
@@ -455,7 +458,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	} // END - if
 
 	// Load user's data
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content)."<br />");
+	//* 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 (isExtensionActive('nickname')) {
@@ -524,10 +527,9 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	if (isFileReadable($FQFN)) {
 		// The local file does exists so we load it. :)
 		$GLOBALS['tpl_content'] = readFromFile($FQFN);
-		$GLOBALS['tpl_content'] = SQL_ESCAPE($GLOBALS['tpl_content']);
 
 		// Run code
-		$GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode($GLOBALS['tpl_content'])."\");";
+		$GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileCode(smartAddSlashes($GLOBALS['tpl_content']))."\");";
 		eval($GLOBALS['tpl_content']);
 	} elseif (!empty($template)) {
 		// Template file not found!
@@ -557,8 +559,12 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	unset($content);
 	unset($DATA);
 
-	// Return compiled content
-	return compileCode($newContent);
+	// Compile the code and eval it
+	$eval = '$newContent = "' . compileCode(smartAddSlashes($newContent)) . '";';
+	eval($eval);
+
+	// Return content
+	return $newContent;
 }
 
 // Send mail out to an email address
@@ -579,7 +585,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 			// Load email address
 			$result_email = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
 				array(bigintval($toEmail)), __FUNCTION__, __LINE__);
-			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email)."<br />");
+			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email).'<br />');
 
 			// Does the user exist?
 			if (SQL_NUMROWS($result_email)) {
@@ -629,12 +635,12 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	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>
-".htmlentities(trim($mailHeader))."
-To      : " . $toEmail."
-Subject : " . $subject."
-Message : " . $message."
-</pre>\n");
+		outputHtml('<pre>
+Headers : ' . str_replace('<', '&lt', str_replace('>', '&gt;', htmlentities(trim($mailHeader)))) . '
+To      : ' . $toEmail . '
+Subject : ' . $subject . '
+Message : ' . $message . '
+</pre>');
 	} elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
 		// Send mail as HTML away
 		sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
@@ -724,7 +730,7 @@ function generatePassword ($length = 0) {
 }
 
 // Generates a human-readable timestamp from the Uni* stamp
-function generateDateTime ($time, $mode = '0') {
+function generateDateTime ($time, $mode = 0) {
 	// Filter out numbers
 	$time = bigintval($time);
 
@@ -737,10 +743,10 @@ function generateDateTime ($time, $mode = '0') {
 	switch (getLanguage()) {
 		case 'de': // German date / time format
 			switch ($mode) {
-				case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
-				case '1': $ret = strtolower(date('d.m.Y - H:i', $time)); break;
-				case '2': $ret = date('d.m.Y|H:i', $time); break;
-				case '3': $ret = date('d.m.Y', $time); break;
+				case 0: $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
+				case 1: $ret = strtolower(date('d.m.Y - H:i', $time)); break;
+				case 2: $ret = date('d.m.Y|H:i', $time); break;
+				case 3: $ret = date('d.m.Y', $time); break;
 				default:
 					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
 					break;
@@ -749,10 +755,10 @@ function generateDateTime ($time, $mode = '0') {
 
 		default: // Default is the US date / time format!
 			switch ($mode) {
-				case '0': $ret = date('r', $time); break;
-				case '1': $ret = date('Y-m-d - g:i A', $time); break;
-				case '2': $ret = date('y-m-d|H:i', $time); break;
-				case '3': $ret = date('y-m-d', $time); break;
+				case 0: $ret = date('r', $time); break;
+				case 1: $ret = date('Y-m-d - g:i A', $time); break;
+				case 2: $ret = date('y-m-d|H:i', $time); break;
+				case 3: $ret = date('y-m-d', $time); break;
 				default:
 					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
 					break;
@@ -801,7 +807,7 @@ function translatePoolType ($type) {
 // Translates the american decimal dot into a german comma
 function translateComma ($dotted, $cut = true, $max = 0) {
 	// Default is 3 you can change this in admin area "Misc -> Misc Options"
-	if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', '3');
+	if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3);
 
 	// Use from config is default
 	$maxComma = getConfig('max_comma');
@@ -887,7 +893,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 = 'modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
+		$URL = '{?URL?}/modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
 	} // END - if
 
 	// Return link
@@ -928,18 +934,25 @@ function countSelection ($array) {
 
 // Generate XHTML code for the CAPTCHA
 function generateCaptchaCode ($code, $type, $DATA, $userid) {
-	return '<IMG border="0" alt="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())
-function makeTime ($H, $M, $S, $stamp) {
+function makeTime ($hours, $minutes, $seconds, $stamp) {
 	// Extract day, month and year from given timestamp
-	$day   = date('d', $stamp);
-	$month = date('m', $stamp);
-	$year  = date('Y', $stamp);
+	$days   = date('d', $stamp);
+	$months = date('m', $stamp);
+	$years  = date('Y', $stamp);
 
 	// Create timestamp for wished time which depends on extracted date
-	return mktime($H, $M, $S, $month, $day, $year);
+	return mktime(
+		$hours,
+		$minutes,
+		$seconds,
+		$months,
+		$days,
+		$years
+	);
 }
 
 // Redirects to an URL and if neccessarry extends it with own base URL
@@ -1151,7 +1164,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 }
 
 //
-function addSelectionBox ($type, $default, $prefix = '', $id = '0') {
+function addSelectionBox ($type, $default, $prefix = '', $id = 0) {
 	$OUT = '';
 
 	if ($type == 'yn') {
@@ -1236,7 +1249,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0') {
 		case 'sec':
 		case 'min':
 			for ($idx = 0; $idx < 60; $idx+=5) {
-				if (strlen($idx) == 1) $idx = '0' . $idx;
+				if (strlen($idx) == 1) $idx = 0 . $idx;
 				$OUT .= "<option value=\"" . $idx."\"";
 				if ($default == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">" . $idx."</option>\n";
@@ -1245,7 +1258,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0') {
 
 		case 'hour':
 			for ($idx = 0; $idx < 24; $idx++) {
-				if (strlen($idx) == 1) $idx = '0' . $idx;
+				if (strlen($idx) == 1) $idx = 0 . $idx;
 				$OUT .= "<option value=\"" . $idx."\"";
 				if ($default == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">" . $idx."</option>\n";
@@ -1294,7 +1307,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
 	// Calculate number for generating the code
 	$a = $code + getConfig('_ADD') - 1;
 
-	if (isConfigEntrySet('master_hash')) {
+	if (isConfigEntrySet('master_salt')) {
 		// Generate hash with master salt from modula of number with the prime number and other data
 		$saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, getConfig('master_salt'));
 
@@ -1302,7 +1315,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
 		$rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi();
 	} else {
 		// Generate hash with "hash of site key" from modula of number with the prime number and other data
-		$saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, 8));
+		$saltedHash = generateHash(($a % getConfig('_PRIME')) . getConfig('ENCRYPT_SEPERATOR') . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a, substr(sha1(getConfig('SITE_KEY')), 0, getConfig('salt_length')));
 
 		// Create number from hash
 		$rcode = hexdec(substr($saltedHash, 8, 9)) / abs(getConfig('rand_no') - $a + sqrt(getConfig('_ADD'))) / pi();
@@ -1323,7 +1336,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
 // Does only allow numbers
 function bigintval ($num, $castValue = true) {
 	// Filter all numbers out
-	$ret = preg_replace("/[^0123456789]/", '', $num);
+	$ret = preg_replace('/[^0123456789]/', '', $num);
 
 	// Shall we cast?
 	if ($castValue) $ret = (double)$ret;
@@ -1648,7 +1661,7 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
 	$NAV = '';
 	for ($page = 1; $page <= $PAGES; $page++) {
 		// Is the page currently selected or shall we generate a link to it?
-		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == '1'))) {
+		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
 			// Is currently selected, so only highlight it
 			$NAV .= '<strong>-';
 		} else {
@@ -1662,7 +1675,7 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
 			$NAV .= '">';
 		}
 		$NAV .= $page;
-		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == '1'))) {
+		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
 			// Is currently selected, so only highlight it
 			$NAV .= '-</strong>';
 		} else {
@@ -1711,7 +1724,7 @@ function extractHostnameFromUrl (&$script) {
 	if (ereg('/', $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));
@@ -1720,7 +1733,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
@@ -1728,10 +1741,25 @@ function extractHostnameFromUrl (&$script) {
 }
 
 // Send a GET request
-function sendGetRequest ($script) {
+function sendGetRequest ($script, $data = array()) {
 	// Extract host name from script
 	$host = extractHostnameFromUrl($script);
 
+	// Add data
+	$scriptData = 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;
+	} else {
+		// Ok, add &
+		$scriptData = '&' . $scriptData;
+	}
+
+	// Add script data
+	$script .= $scriptData;
+
 	// Generate GET request header
 	$request  = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
@@ -1768,7 +1796,7 @@ function sendPostRequest ($script, $postData) {
 	$host = extractHostnameFromUrl($script);
 
 	// Construct request
-	$data = http_build_query($postData, '','&');
+	$data = http_build_query($postData, '', '&');
 
 	// Generate POST request header
 	$request  = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
@@ -1806,7 +1834,7 @@ function sendRawRequest ($host, $request) {
 	} // END - if
 
 	// Open connection
-	//* DEBUG: */ die("SCRIPT=" . $script."<br />");
+	//* DEBUG: */ die("SCRIPT=" . $script.'<br />');
 	if ($useProxy === true) {
 		// Connect to host through proxy connection
 		$fp = @fsockopen(compileCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
@@ -1924,11 +1952,11 @@ function isEmailValid ($email) {
 function isUrlValid ($URL, $compile=true) {
 	// Trim URL a little
 	$URL = trim(urldecode($URL));
-	//* DEBUG: */ outputHtml($URL."<br />");
+	//* DEBUG: */ outputHtml($URL.'<br />');
 
 	// Compile some chars out...
 	if ($compile === true) $URL = compileUriCode($URL, false, false, false);
-	//* DEBUG: */ outputHtml($URL."<br />");
+	//* DEBUG: */ outputHtml($URL.'<br />');
 
 	// Check for the extension filter
 	if (isExtensionActive('filter')) {
@@ -2007,7 +2035,7 @@ function generateEmailLink ($email, $table = 'admins') {
 // Generate a hash for extra-security for all passwords
 function generateHash ($plainText, $salt = '') {
 	// Is the required extension 'sql_patches' there and a salt is not given?
-	if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches'))) && (empty($salt))) {
+	if (((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionActive('sql_patches')) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) && (empty($salt))) {
 		// Extension sql_patches is missing/outdated so we hash the plain text with MD5
 		return md5($plainText);
 	} // END - if
@@ -2045,8 +2073,15 @@ function generateHash ($plainText, $salt = '') {
 		//* DEBUG: */ outputHtml($salt." (".strlen($salt).")<br />");
 	} else {
 		// Use given salt
+		//* DEBUG: */ print 'salt=' . $salt . '<br />';
 		$salt = substr($salt, 0, getConfig('salt_length'));
-		//* DEBUG: */ outputHtml("GIVEN={$salt}<br />");
+		//* DEBUG: */ print 'salt=' . $salt . '(' . strlen($salt) . '/' . getConfig('salt_length') . ')<br />';
+
+		// Sanity check on salt
+		if (strlen($salt) != getConfig('salt_length')) {
+			// Not the same!
+			debug_report_bug(__FUNCTION__.': salt length mismatch! ('.strlen($salt).'/'.getConfig('salt_length').')');
+		} // END - if
 	}
 
 	// Return hash
@@ -2139,7 +2174,7 @@ function generatePassString ($passHash) {
 	$ret = $passHash;
 
 	// Is a secret key and master salt already initialized?
-	if ((isExtensionInstalled('sql_patches')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) {
+	if ((isExtensionInstalled('sql_patches')) && (isExtensionInstalledAndNewer('other', '0.2.5')) && (isConfigEntrySet('_PRIME')) && (isConfigEntrySet('secret_key')) && (isConfigEntrySet('master_salt'))) {
 		// Only calculate when the secret key is generated
 		$newHash = ''; $start = 9;
 		for ($idx = 0; $idx < 10; $idx++) {
@@ -2151,16 +2186,17 @@ function generatePassString ($passHash) {
 			} elseif ($part2 > $part1) {
 				$mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi()));
 			}
-			$mod = substr(round($mod), 0, 4);
-			$mod = str_repeat('0', 4-strlen($mod)) . $mod;
-			//* DEBUG: */ outputHtml("*" . $start.'=' . $mod."*<br />");
+			$mod = substr($mod, 0, 4);
+			//* DEBUG: */ outputHtml('part1='.$part1.'/part2='.$part2.'/mod=' . $mod . '('.strlen($mod).')<br />');
+			$mod = str_repeat(0, (4 - strlen($mod))) . $mod;
+			//* DEBUG: */ outputHtml('*' . $start . '=' . $mod . '*<br />');
 			$start += 4;
 			$newHash .= $mod;
 		} // END - for
 
-		//* DEBUG: */ print($passHash."<br />" . $newHash." (".strlen($newHash).')');
+		//* DEBUG: */ print($passHash.'<br />' . $newHash." (".strlen($newHash).')<br />');
 		$ret = generateHash($newHash, getConfig('master_salt'));
-		//* DEBUG: */ print($ret."<br />");
+		//* DEBUG: */ print('ret='.$ret.'<br />');
 	} else {
 		// Hash it simple
 		//* DEBUG: */ outputHtml("--" . $passHash."--<br />");
@@ -2281,7 +2317,7 @@ function getCurrentTheme () {
 	$ret = 'default';
 
 	// Load default theme if not empty from configuration
-	if (getConfig('default_theme') != '') $ret = getConfig('default_theme');
+	if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme');
 
 	if (!isSessionVariableSet('mxchange_theme')) {
 		// Set default theme
@@ -2393,12 +2429,12 @@ function generateErrorCodeFromUserStatus ($status) {
 // Function to search for the last modifified file
 function searchDirsRecursive ($dir, &$last_changed) {
 	// Get dir as array
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):dir=" . $dir."<br />");
+	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):dir=" . $dir.'<br />');
 	// Does it match what we are looking for? (We skip a lot files already!)
 	// RegexPattern to exclude  ., .., .revision,  .svn, debug.log or .cache in the filenames
 	$excludePattern = '@(\.revision|debug\.log|\.cache|config\.php)$@';
 	$ds = getArrayFromDirectory($dir, '', true, false, array(), '.php', $excludePattern);
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ds[]=".count($ds)."<br />");
+	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ds[]=".count($ds).'<br />');
 
 	// Walk through all entries
 	foreach ($ds as $d) {
@@ -2411,7 +2447,7 @@ function searchDirsRecursive ($dir, &$last_changed) {
 			// $FQFN is a directory so also crawl into this directory
 			$newDir = $d;
 			if (!empty($dir)) $newDir = $dir . '/'. $d;
-			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):DESCENT: " . $newDir."<br />");
+			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):DESCENT: " . $newDir.'<br />');
 			searchDirsRecursive($newDir, $last_changed);
 		} elseif (isFileReadable($FQFN)) {
 			// $FQFN is a filename and no directory
@@ -2590,6 +2626,17 @@ function debug_get_printable_backtrace () {
 
 // Output a debug backtrace to the user
 function debug_report_bug ($message = '') {
+	// Is this already called?
+	if (isset($GLOBALS[__FUNCTION__])) {
+		// Other backtrace
+		print 'Message:'.$message.'<br />Backtrace:<pre>';
+		debug_print_backtrace();
+		die('</pre>');
+	} // END - if
+
+	// Set this function as called
+	$GLOBALS[__FUNCTION__] = true;
+
 	// Init message
 	$debug = '';
 
@@ -2647,7 +2694,7 @@ function getMessageFromErrorCode ($code) {
 		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('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;
@@ -2678,7 +2725,7 @@ function getMessageFromErrorCode ($code) {
 
 			// Load timestamp from last order
 			list($timestamp) = SQL_FETCHROW($result);
-			$timestamp = generateDateTime($timestamp, '1');
+			$timestamp = generateDateTime($timestamp, 1);
 
 			// Free memory
 			SQL_FREERESULT($result);
@@ -2815,7 +2862,7 @@ function isUrlValidSimple ($url) {
 			// @TODO Are these convertions still required?
 			$pat = str_replace('.', "&#92;&#46;", $pat);
 			$pat = str_replace('@', "&#92;&#64;", $pat);
-			//* DEBUG: */ outputHtml($key."=&nbsp;" . $pat . "<br />");
+			//* DEBUG: */ outputHtml($key."=&nbsp;" . $pat . '<br />');
 		} // END - if
 
 		// Check if expression matches
@@ -2905,7 +2952,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 	return false;
 }
 // Send notification to admin
-function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') {
+function sendAdminNotification ($subject, $templateName, $content=array(), $userid = 0) {
 	if (getExtensionVersion('admins') >= '0.4.1') {
 		// Send new way
 		sendAdminsEmails($subject, $templateName, $content, $userid);
@@ -3033,7 +3080,7 @@ function handleLoginFailtures ($accessLevel) {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):accessLevel={$accessLevel}<br />");
 			$content = array(
 				'login_failures' => getSession('mxchange_' . $accessLevel.'_failures'),
-				'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel.'_last_fail'), '2')
+				'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel.'_last_fail'), 2)
 			);
 
 			// Load template
@@ -3059,7 +3106,7 @@ function rebuildCacheFile ($cache, $inc = '', $force = false) {
 		// Rebuild cache
 		if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
 			// Destroy it
-			$GLOBALS['cache_instance']->removeCacheFile(false, $force);
+			$GLOBALS['cache_instance']->removeCacheFile($force);
 		} // END - if
 
 		// Include file given?
@@ -3142,7 +3189,7 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 // Determines referal id and sets it
 function determineReferalId () {
 	// Skip this in non-html-mode
-	if (getOutputMode() != '0') return false;
+	if (getOutputMode() != 0) return false;
 
 	// Check if refid is set
 	if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
@@ -3174,7 +3221,7 @@ function determineReferalId () {
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (getConfig('def_refid') > 0))) {
+	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (isConfigEntrySet('def_refid')) && (getConfig('def_refid') > 0))) {
 		// Set cookie
 		setSession('refid', $GLOBALS['refid']);
 	} // END - if
@@ -3363,7 +3410,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 		// Exclude '.', '..' and entries in $excludeArray automatically
 		if (in_array($baseFile, $excludeArray, true))  {
 			// Exclude them
-			//* DEBUG: */ outputHtml('excluded=' . $baseFile . "<br />");
+			//* DEBUG: */ outputHtml('excluded=' . $baseFile . '<br />');
 			continue;
 		} // END - if
 
@@ -3377,9 +3424,9 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
 		// Check if the base filename 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 />");
-			//* DEBUG: */ outputHtml('baseFile:' . $baseFile . "<br />");
-			//* DEBUG: */ outputHtml('FQFN:' . $FQFN . "<br />");
+			//* DEBUG: */ outputHtml('baseDir:' . $baseDir . '<br />');
+			//* DEBUG: */ outputHtml('baseFile:' . $baseFile . '<br />');
+			//* DEBUG: */ outputHtml('FQFN:' . $FQFN . '<br />');
 
 			// Exclude this one
 			continue;
@@ -3462,8 +3509,25 @@ function mapModuleToTable ($moduleName) {
 
 // Add SQL debug data to array for later output
 function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
-	// Don't execute anything here if we don't need
-	if (getConfig('display_debug_sqls') != 'Y') return;
+	// Already executed?
+	if (isset($GLOBALS['debug_sqls'][$F][$L][$sqlString])) {
+		// Then abort here, we don't need to profile a query twice
+		return;
+	} // END - if
+
+	// Remeber this as profiled (or not, but we don't care here)
+	$GLOBALS['debug_sqls'][$F][$L][$sqlString] = true;
+
+	// Do we have cache?
+	if (!isset($GLOBALS['debug_sql_available'])) {
+		// Check it and cache it in $GLOBALS
+		$GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y'));
+	} // END - if
+	
+	// Don't execute anything here if we don't need or ext-other is missing
+	if ($GLOBALS['debug_sql_available'] === false) {
+		return;
+	} // END - if
 
 	// Generate record
 	$record = array(
@@ -3488,7 +3552,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(__FILE__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_CANNOT_INITIALIZE'));
 	} // END - if
 }
 
@@ -3507,89 +3571,31 @@ function getMessageFromIndexedArray ($message, $pos, $array) {
 	return $ret;
 }
 
-// Handles fatal errors
-function handleFatalErrors () {
-	// Do we have errors to handle and right output mode?
-	if ((getTotalFatalErrors() == 0) || (getOutputMode() != 0)) {
-		// Abort executing here
-		return false;
-	} // END - if
-
-	// Set content type
-	setContentType('text/html');
-
-	// Load config here
-	loadIncludeOnce('inc/load_config.php');
-
-	// Set unset variable
-	if (empty($check)) $check = '';
-
-	// Default is none
-	$content = '';
-
-	// Installation phase or regular mode?
-	if ((isInstallationPhase())) {
-		// While we are installing ouput other header than while it is installed... :-)
-		$OUT = '';
-		foreach (getFatalArray() as $key => $value) {
-			// Prepare content for the template
-			$content = array(
-				'key'   => ($key + 1),
-				'value' => $value
-			);
-
-			// Load row template
-			$OUT .= loadTemplate('install_fatal_row', true, $content);
-		}
+// Print code with line numbers
+function linenumberCode ($code)    {
+	if (!is_array($code)) $codeE = explode("\n", $code); else $codeE = $code;
+	$count_lines = count($codeE);
 
-		// Load main template
-		$content = loadTemplate('install_fatal_table', true, $OUT);
-	} elseif (isInstalled()) {
-		// Display all runtime fatal errors
-		$OUT = '';
-		foreach (getFatalArray() as $key => $value) {
-			// Prepare content for the template
-			$content = array(
-				'key'   => ($key + 1),
-				'value' => $value
-			);
-
-			// Load row template
-			$OUT .= loadTemplate('runtime_fatal_row', true, $content);
+	$r = 'Line | Code:<br />';
+	foreach($codeE as $line => $c) {
+		$r .= '<div class="line"><span class="linenum">';
+		if ($count_lines == 1) {
+			$r .= 1;
+		} else {
+			$r .= ($line == ($count_lines - 1)) ? '' :  ($line+1);
 		}
+		$r .= '</span>|';
 
-		// Load main template
-		$content = loadTemplate('runtime_fatal_table', true, $OUT);
+		// Add code
+		$r .= '<span class="linetext">' . htmlentities($c) . '</span></div>';
 	}
 
-	// Message to regular users (non-admin)
-	$CORR = getMessage('FATAL_REPORT_ERRORS');
-
-	// PHP warnings fixed
-	if ($check == 'done') {
-		if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
-	} // END - if
-
-	// Remember all in array
-	$content = array(
-		'rows' => $content,
-		'corr' => $CORR
-	);
-
-	// Load footer
-	loadIncludeOnce('inc/header.php');
-
-	// Load main template
-	loadTemplate('fatal_errors', false, $content);
-
-	// Delete all to prevent double-display
-	initFatalMessages();
-
-	// Load footer
-	loadIncludeOnce('inc/footer.php');
+	return '<div class="code">' . $r . '</div>';
+}
 
-	// Abort here
-	shutdown();
+// Convert ';' to ', ' for e.g. receiver list
+function convertReceivers ($old) {
+	return str_replace(';', ', ', $old);
 }
 
 //////////////////////////////////////////////////
@@ -3605,5 +3611,29 @@ if (!function_exists('html_entity_decode')) {
 	}
 } // END - if
 
+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='') {
+		$ret = array();
+		foreach ((array)$data as $k => $v) {
+			if (is_int($k) && $prefix != null) {
+				$k = urlencode($prefix . $k);
+			} // END - if
+
+			if ((!empty($key)) || ($key === 0))  $k = $key.'['.urlencode($k).']';
+
+			if (is_array($v) || is_object($v)) {
+				array_push($ret, http_build_query($v, '', $sep, $k));
+			} else {
+				array_push($ret, $k.'='.urlencode($v));
+			}
+		} // END - foreach
+
+		if (empty($sep)) $sep = ini_get('arg_separator.output');
+
+		return implode($sep, $ret);
+	}
+}// // END - if
+
 // [EOF]
 ?>