X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=d96e2dbf60f3bc90cae02d3b6edc12a32aaa5c70;hb=d480b3a8bc2a5c4654067c732228490e448a6c8a;hp=1dc08094e8e433784ba375824ae1c59a4305fd48;hpb=e98608bf2a6208376d30996cf9152e1f091ac369;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 1dc08094e8..d96e2dbf60 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -41,20 +41,6 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-// Check if our config file is writeable or not
-function IS_INC_WRITEABLE ($inc) {
-	// Generate FQFN
-	$FQFN = sprintf("%sinc/%s.php", constant('PATH'), $inc);
-
-	// Abort by simple test
-	if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN))) {
-		return false;
-	} // END - if
-
-	// Test write-access on directory
-	return is_writeable(dirname($FQFN));
-}
-
 // Output HTML code directly or "render" it. You addionally switch the new-line character off
 function OUTPUT_HTML ($HTML, $newLine = true) {
 	// Some global variables
@@ -84,7 +70,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 
 		case "direct":
 			// If we are switching from render to direct output rendered code
-			if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ""; }
+			if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ''; }
 
 			// The same as above... ^
 			OUTPUT_RAW($HTML);
@@ -94,7 +80,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 		default:
 			// Huh, something goes wrong or maybe you have edited config.php ???
 			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
-			mxchange_die("<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}");
+			app_die(__FUNCTION__, __LINE__, "<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}");
 			break;
 		}
 	} elseif ((constant('_OB_CACHING') == "on") && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
@@ -128,22 +114,22 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 		header("Pragma: no-cache"); // HTTP/1.0
 		header("Connection: Close");
 
-		// Extension "rewrite" installed?
-		if ((EXT_IS_ACTIVE("rewrite")) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+		// Extension 'rewrite' installed?
+		if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 			$OUTPUT = REWRITE_LINKS($OUTPUT);
 		} // END - if
 
 		// Compile and run finished rendered HTML code
 		while (strpos($OUTPUT, '{!') > 0) {
 			// Prepare the content and eval() it...
-			$newContent = "";
+			$newContent = '';
 			$eval = "\$newContent = \"".COMPILE_CODE(smartAddSlashes($OUTPUT))."\";";
 			eval($eval);
 
 			// Was that eval okay?
 			if (empty($newContent)) {
 				// Something went wrong!
-				mxchange_die("Evaluation error:<pre>".htmlentities($eval)."</pre>");
+				app_die(__FUNCTION__, __LINE__, "Evaluation error:<pre>".htmlentities($eval)."</pre>");
 			} // END - if
 			$OUTPUT = $newContent;
 		} // END - while
@@ -152,7 +138,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 		OUTPUT_RAW($OUTPUT);
 	} elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {
 		// Rewrite links when rewrite extension is active
-		if ((EXT_IS_ACTIVE("rewrite")) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+		if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 			$OUTPUT = REWRITE_LINKS($OUTPUT);
 		} // END - if
 
@@ -190,7 +176,7 @@ function getFatalArray () {
 }
 
 // Add a fatal error message to the queue array
-function addFatalMessage ($F, $L, $message, $extra="") {
+function addFatalMessage ($F, $L, $message, $extra='') {
 	debug_report_bug($message);
 	if (is_array($extra)) {
 		// Multiple extras for a message with masks
@@ -225,7 +211,10 @@ function getTotalFatalErrors () {
 // Load a template file and return it's content (only it's name; do not use ' or ")
 function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	// Add more variables which you want to use in your template files
-	global $DATA, $_CONFIG, $username;
+	global $DATA, $username;
+
+	// Get whole config array
+	$_CONFIG = getConfigArray();
 
 	// Make all template names lowercase
 	$template = strtolower($template);
@@ -239,7 +228,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	$HTTP_USER_AGENT = GET_USER_AGENT();
 
 	// Init some data
-	$ret = "";
+	$ret = '';
 	if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
 
 	// @DEPRECATED Try to rewrite the if() condition
@@ -274,47 +263,47 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	$date_time = MAKE_DATETIME(time(), "1");
 
 	// Base directory
-	$BASE = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
-	$MODE = "";
+	$basePath = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
+	$mode = '';
 
 	// Check for admin/guest/member templates
 	if (strpos($template, "admin_") > -1) {
 		// Admin template found
-		$MODE = "admin/";
+		$mode = "admin/";
 	} elseif (strpos($template, "guest_") > -1) {
 		// Guest template found
-		$MODE = "guest/";
+		$mode = "guest/";
 	} elseif (strpos($template, "member_") > -1) {
 		// Member template found
-		$MODE = "member/";
+		$mode = "member/";
 	} elseif (strpos($template, "install_") > -1) {
 		// Installation template found
-		$MODE = "install/";
+		$mode = "install/";
 	} elseif (strpos($template, "ext_") > -1) {
 		// Extension template found
-		$MODE = "ext/";
+		$mode = "ext/";
 	} elseif (strpos($template, "la_") > -1) {
 		// "Logical-area" template found
-		$MODE = "la/";
+		$mode = "la/";
 	} else {
 		// Test for extension
 		$test = substr($template, 0, strpos($template, "_"));
 		if (EXT_IS_ACTIVE($test)) {
 			// Set extra path to extension's name
-			$MODE = $test."/";
+			$mode = $test."/";
 		}
 	}
 
 	////////////////////////
 	// Generate file name //
 	////////////////////////
-	$FQFN = $BASE.$MODE.$template.".tpl";
+	$FQFN = $basePath.$mode.$template.".tpl";
 
-	if ((!empty($GLOBALS['what'])) && ((strpos($template, "_header") > 0) || (strpos($template, "_footer") > 0)) && (($MODE == "guest/") || ($MODE == "member/") || ($MODE == "admin/"))) {
+	if ((!empty($GLOBALS['what'])) && ((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",
-			$BASE,
-			$MODE,
+			$basePath,
+			$mode,
 			$template,
 			SQL_ESCAPE($GLOBALS['what'])
 		);
@@ -329,7 +318,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	// Does the special template exists?
 	if (!FILE_READABLE($FQFN)) {
 		// Reset to default template
-		$FQFN = $BASE.$template.".tpl";
+		$FQFN = $basePath.$template.".tpl";
 	} // END - if
 
 	// Now does the final template exists?
@@ -341,7 +330,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 		while (strpos($tmpl_file, "'") !== false) { $tmpl_file = str_replace("'", '{QUOT}', $tmpl_file); }
 
 		// Do we have to compile the code?
-		$ret = "";
+		$ret = '';
 		if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) {
 			// Okay, compile it!
 			$tmpl_file = "\$ret=\"".COMPILE_CODE(smartAddSlashes($tmpl_file))."\";";
@@ -460,13 +449,13 @@ To      : ".$toEmail."
 Subject : ".$subject."
 Message : ".$message."
 </pre>\n");
-	} elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) {
+	} elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) {
 		// Send mail as HTML away
 		SEND_HTML_EMAIL($toEmail, $subject, $message, $mailHeader);
 	} elseif (!empty($toEmail)) {
 		// Send Mail away
 		SEND_RAW_EMAIL($toEmail, $subject, $message, $mailHeader);
-	} elseif ($HTML == "N") {
+	} elseif ($HTML == 'N') {
 		// Problem found!
 		SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$subject, $message, $mailHeader);
 	}
@@ -506,7 +495,7 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
 		}
 		$mail->FromName   = constant('MAIN_TITLE');
 		$mail->Subject    = $subject;
-		if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) {
+		if ((EXT_IS_ACTIVE('html_mail')) && (strip_tags($msg) != $msg)) {
 			$mail->Body       = $msg;
 			$mail->AltBody    = "Your mail program required HTML support to read this mail!";
 			$mail->WordWrap   = 70;
@@ -514,7 +503,7 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
 		} else {
 			$mail->Body       = decodeEntities($msg);
 		}
-		$mail->AddAddress($toEmail, "");
+		$mail->AddAddress($toEmail, '');
 		$mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
 		$mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
 		$mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
@@ -535,7 +524,7 @@ function GEN_PASS ($LEN = 0) {
 	$ABC = explode(",", "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,0,1,2,3,4,5,6,7,8,9,-,+,_,/");
 
 	// Start creating password
-	$PASS = "";
+	$PASS = '';
 	for ($i = 0; $i < $LEN; $i++) {
 		$PASS .= $ABC[mt_rand(0, count($ABC) -1)];
 	} // END - for
@@ -632,7 +621,7 @@ function DEREFERER ($URL) {
 	// Don't de-refer our own links!
 	if (substr($URL, 0, strlen(URL)) != URL) {
 		// De-refer this link
-		$URL = "modules.php?module=loader&amp;url=".encodeString(compileUriCode($URL));
+		$URL = 'modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
 	} // END - if
 
 	// Return link
@@ -642,13 +631,13 @@ function DEREFERER ($URL) {
 // Translate Uni*-like gender to human-readable
 function TRANSLATE_GENDER ($gender) {
 	// Default
-	$ret = "!{$gender}!";
+	$ret = '!' . $gender . '!';
 
 	// Male/female or company?
 	switch ($gender) {
-		case "M": $ret = getMessage('GENDER_M'); break;
-		case "F": $ret = getMessage('GENDER_F'); break;
-		case "C": $ret = getMessage('GENDER_C'); break;
+		case 'M': $ret = getMessage('GENDER_M'); break;
+		case 'F': $ret = getMessage('GENDER_F'); break;
+		case 'C': $ret = getMessage('GENDER_C'); break;
 		default:
 			// Log unknown gender
 			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender));
@@ -678,21 +667,23 @@ function SELECTION_COUNT ($array) {
 	}
 	return $ret;
 }
+
 //
 function IMG_CODE ($code, $type, $DATA, $uid) {
-	return "<IMG border=\"0\" alt=\"Code\" src=\"{!URL!}/mailid_top.php?uid=".$uid."&amp;".$type."=".$DATA."&amp;mode=img&amp;code=".$code."\">";
+	return '<IMG border="0" alt="Code" src="{!URL!}/mailid_top.php?uid=' . $uid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '" />';
 }
+
 //
 function TRANSLATE_STATUS ($status) {
 	switch ($status)
 	{
-	case "UNCONFIRMED":
-	case "CONFIRMED":
-	case "LOCKED":
+	case 'UNCONFIRMED':
+	case 'CONFIRMED':
+	case 'LOCKED':
 		$ret = getMessage(sprintf("ACCOUNT_%s", $status));
 		break;
 
-	case "":
+	case '':
 	case null:
 		$ret = getMessage('ACCOUNT_DELETED');
 		break;
@@ -712,7 +703,7 @@ function GET_LANGUAGE() {
 	$ret = constant('DEFAULT_LANG');
 
 	// Init variable
-	$lang = "";
+	$lang = '';
 
 	// Is the variable set
 	if (REQUEST_ISSET_GET(('mx_lang'))) {
@@ -723,7 +714,7 @@ function GET_LANGUAGE() {
 		$ret = $GLOBALS['cache_array']['language'];
 	} elseif (!empty($lang)) {
 		// Check if main language file does exist
-		if (FILE_READABLE(constant('PATH')."inc/language/".$lang.".php")) {
+		if (FILE_READABLE(constant('PATH').'inc/language/'.$lang.'.php')) {
 			// Okay found, so let's update cookies
 			SET_LANGUAGE($lang);
 		}
@@ -750,14 +741,14 @@ function SET_LANGUAGE ($lang) {
 	set_session('mx_lang', $lang);
 }
 //
-function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
+function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 	global $DATA, $_CONFIG;
 
 	// Make sure all template names are lowercase!
 	$template = strtolower($template);
 
-	// Default "nickname" if extension is not installed
-	$nick = "---";
+	// Default 'nickname' if extension is not installed
+	$nick = '---';
 
 	// Prepare IP number and User Agent
 	$REMOTE_ADDR     = GET_REMOTE_ADDR();
@@ -797,7 +788,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content)."<br />\n";
 	if (($UID > 0) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
-		if (EXT_IS_ACTIVE("nickname")) {
+		if (EXT_IS_ACTIVE('nickname')) {
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />\n";
 			// Load nickname
 			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
@@ -828,38 +819,38 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
 	$DATA['email'] = $email;
 
 	// Base directory
-	$BASE = sprintf("%stemplates/%s/emails/", constant('PATH'), GET_LANGUAGE());
+	$basePath = sprintf("%stemplates/%s/emails/", constant('PATH'), GET_LANGUAGE());
 
 	// Check for admin/guest/member templates
 	if (strpos($template, "admin_") > -1) {
 		// Admin template found
-		$FQFN = $BASE."admin/".$template.".tpl";
+		$FQFN = $basePath."admin/".$template.".tpl";
 	} elseif (strpos($template, "guest_") > -1) {
 		// Guest template found
-		$FQFN = $BASE."guest/".$template.".tpl";
+		$FQFN = $basePath."guest/".$template.".tpl";
 	} elseif (strpos($template, "member_") > -1) {
 		// Member template found
-		$FQFN = $BASE."member/".$template.".tpl";
+		$FQFN = $basePath."member/".$template.".tpl";
 	} else {
 		// Test for extension
 		$test = substr($template, 0, strpos($template, "_"));
 		if (EXT_IS_ACTIVE($test)) {
 			// Set extra path to extension's name
-			$FQFN = $BASE.$test."/".$template.".tpl";
+			$FQFN = $basePath.$test."/".$template.".tpl";
 		} else {
 			// No special filename
-			$FQFN = $BASE.$template.".tpl";
+			$FQFN = $basePath.$template.".tpl";
 		}
 	}
 
 	// Does the special template exists?
 	if (!FILE_READABLE($FQFN)) {
 		// Reset to default template
-		$FQFN = $BASE.$template.".tpl";
+		$FQFN = $basePath.$template.".tpl";
 	} // END - if
 
 	// Now does the final template exists?
-	$newContent = "";
+	$newContent = '';
 	if (FILE_READABLE($FQFN)) {
 		// The local file does exists so we load it. :)
 		$tmpl_file = READ_FILE($FQFN);
@@ -918,11 +909,14 @@ function LOAD_URL ($URL, $addUrlData=true) {
 	if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
 		// Make all URLs full-qualified
 		$URL = "".$URL;
-	}
+	} // END - if
 
-	// Get output buffer
+	// Three different debug ways...
 	//* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, $URL);
+	//* DEBUG: */ die($URL);
+
+	// Get output buffer
 	$OUTPUT = ob_get_contents();
 
 	// Clear it only if there is content
@@ -946,10 +940,12 @@ function LOAD_URL ($URL, $addUrlData=true) {
 		header ("Location: ".str_replace("&amp;", "&", $URL));
 	} else {
 		// Output error message
-		LOAD_INC("inc/header.php");
+		LOAD_INC('inc/header.php');
 		LOAD_TEMPLATE("redirect_url", false, str_replace("&amp;", "&", $URL));
-		LOAD_INC("inc/footer.php");
+		LOAD_INC('inc/footer.php');
 	}
+
+	// Shut the mailer down here
 	shutdown();
 }
 
@@ -1105,9 +1101,9 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 
 //
 function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
-	$OUT = "";
+	$OUT = '';
 
-	if ($type == "yn") {
+	if ($type == 'yn') {
 		// This is a yes/no selection only!
 		if ($id > 0) $prefix .= "[".$id."]";
 		$OUT .= "    <select name=\"".$prefix."\" class=\"register_select\" size=\"1\">\n";
@@ -1123,7 +1119,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 	case "day": // Day
 		for ($idx = 1; $idx < 32; $idx++) {
 			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
@@ -1131,7 +1127,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 	case "month": // Month
 		foreach ($GLOBALS['month_descr'] as $month => $descr) {
 			$OUT .= "<option value=\"".$month."\"";
-			if ($DEFAULT == $month) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $month) $OUT .= ' selected="selected"';
 			$OUT .= ">".$descr."</option>\n";
 		} // END - for
 		break;
@@ -1141,7 +1137,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		$YEAR = date('Y', time());
 
 		// Use configured min age or fixed?
-		if (GET_EXT_VERSION("other") >= "0.2.1") {
+		if (GET_EXT_VERSION('other') >= '0.2.1') {
 			// Configured
 			$startYear = $YEAR - getConfig('min_age');
 		} else {
@@ -1156,7 +1152,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		if (($DEFAULT > $minYear) && ($DEFAULT >= $YEAR)) {
 			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++) {
 				$OUT .= "<option value=\"".$idx."\"";
-				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+				if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			} // END - for
 		} elseif ($DEFAULT == -1) {
@@ -1169,7 +1165,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 			// Get current year and subtract the configured minimum age
 			$OUT .= "<option value=\"".($minYear - 1)."\">&lt;".$minYear."</option>\n";
 			// Calculate earliest year depending on extension version
-			if (GET_EXT_VERSION("other") >= "0.2.1") {
+			if (GET_EXT_VERSION('other') >= '0.2.1') {
 				// Use configured minimum age
 				$YEAR = date('Y', time()) - getConfig('min_age');
 			} else {
@@ -1180,7 +1176,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 			// Construct year selection list
 			for ($idx = $minYear; $idx <= $YEAR; $idx++) {
 				$OUT .= "<option value=\"".$idx."\"";
-				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+				if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			} // END - for
 		}
@@ -1191,7 +1187,7 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		for ($idx = 0; $idx < 60; $idx+=5) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
 			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
@@ -1200,16 +1196,16 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 		for ($idx = 0; $idx < 24; $idx++) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
 			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
+			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
 			$OUT .= ">".$idx."</option>\n";
 		} // END - for
 		break;
 
-	case "yn":
+	case 'yn':
 		$OUT .= "<option value=\"Y\"";
-		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == 'Y') $OUT .= ' selected="selected"';
 		$OUT .= ">{--YES--}</option>\n<option value=\"N\"";
-		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == 'N') $OUT .= ' selected="selected"';
 		$OUT .= ">{--NO--}</option>\n";
 		break;
 	}
@@ -1222,8 +1218,8 @@ function TRANSLATE_YESNO ($yn) {
 	// Default
 	$translated = "??? (".$yn.")";
 	switch ($yn) {
-		case "Y": $translated = getMessage('YES'); break;
-		case "N": $translated = getMessage('NO'); break;
+		case 'Y': $translated = getMessage('YES'); break;
+		case 'N': $translated = getMessage('NO'); break;
 		default:
 			// Log unknown value
 			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn));
@@ -1286,7 +1282,7 @@ function generateRandomCodde ($length, $code, $uid, $DATA="") {
 	if ($len == 0) $len = 10;
 
 	// Cut off requested counts of number
-	$return = substr(str_replace('.', "", $rcode), 0, $len);
+	$return = substr(str_replace('.', '', $rcode), 0, $len);
 
 	// Done building code
 	return $return;
@@ -1295,7 +1291,7 @@ function generateRandomCodde ($length, $code, $uid, $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;
@@ -1460,7 +1456,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 10; $idx++) {
 				$OUT .= "    <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $Y) $OUT .= " selected=\"selected\"";
+				if ($idx == $Y) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1474,7 +1470,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			for ($idx = 0; $idx <= 11; $idx++)
 			{
 					$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $M) $OUT .= " selected=\"selected\"";
+				if ($idx == $M) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1487,7 +1483,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 4; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $W) $OUT .= " selected=\"selected\"";
+				if ($idx == $W) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1500,7 +1496,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 31; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $D) $OUT .= " selected=\"selected\"";
+				if ($idx == $D) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1513,7 +1509,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 23; $idx++) 	{
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $h) $OUT .= " selected=\"selected\"";
+				if ($idx == $h) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1526,7 +1522,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $m) $OUT .= " selected=\"selected\"";
+				if ($idx == $m) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1539,7 +1535,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-				if ($idx == $s) $OUT .= " selected=\"selected\"";
+				if ($idx == $s) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
 			$OUT .= "  </select></td>\n";
@@ -1616,7 +1612,7 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
 		// "implode" IDs and query string
 		$aid = implode(",", $adminIds);
 		if ($aid == "-1") {
-			if (EXT_IS_ACTIVE("events")) {
+			if (EXT_IS_ACTIVE('events')) {
 				// Add line to user events
 				EVENTS_ADD_LINE($subj, $msg, $UID);
 			} else {
@@ -1650,8 +1646,8 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
 //
 function CREATE_FANCY_TIME ($stamp) {
 	// Get data array with years/months/weeks/days/...
-	$data = CREATE_TIME_SELECTIONS($stamp, "", "", "", true);
-	$ret = "";
+	$data = CREATE_TIME_SELECTIONS($stamp, '', '', '', true);
+	$ret = '';
 	foreach($data as $k => $v) {
 		if ($v > 0) {
 			// Value is greater than 0 "eval" data to return string
@@ -1676,16 +1672,16 @@ function CREATE_FANCY_TIME ($stamp) {
 
 //
 function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
-	$SEP = ""; $TOP = "";
+	$SEP = ''; $TOP = '';
 	if (!$show_form) {
 		$TOP = " top2";
 		$SEP = "<tr><td colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</td></tr>";
 	}
 
-	$NAV = "";
+	$NAV = '';
 	for ($page = 1; $page <= $PAGES; $page++) {
 		// Is the page currently selected or shall we generate a link to it?
-		if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+		if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == "1"))) {
 			// Is currently selected, so only highlight it
 			$NAV .= "<strong>-";
 		} else {
@@ -1693,13 +1689,13 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
 			$NAV .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;
 
 			// Add userid when we shall show all mails from a single member
-			if ((REQUEST_ISSET_GET(('uid'))) && (bigintval(REQUEST_GET('uid')) > 0)) $NAV .= "&amp;uid=".bigintval(REQUEST_GET('uid'));
+			if ((REQUEST_ISSET_GET('uid')) && (bigintval(REQUEST_GET('uid')) > 0)) $NAV .= "&amp;uid=".bigintval(REQUEST_GET('uid'));
 
 			// Close open anchor tag
 			$NAV .= "\">";
 		}
 		$NAV .= $page;
-		if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+		if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == "1"))) {
 			// Is currently selected, so only highlight it
 			$NAV .= "-</strong>";
 		} else {
@@ -1746,7 +1742,7 @@ function EXTRACT_HOST (&$script) {
 	} // END - if
 
 	// Extract host name
-	$host = str_replace("http://", "", $url);
+	$host = str_replace("http://", '', $url);
 	if (ereg("/", $host)) $host = substr($host, 0, strpos($host, "/"));
 
 	// Generate relative URL
@@ -1800,7 +1796,7 @@ function POST_URL ($script, $postData) {
 	if (!is_array($postData)) {
 		// Abort here
 		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("postData is not an array. Type: %s", gettype($postData)));
-		return array("", "", "");
+		return array("", '', '');
 	} // END - if
 
 	// Compile the script name
@@ -1833,7 +1829,7 @@ function POST_URL ($script, $postData) {
 // Sends a raw request to another host
 function SEND_RAW_REQUEST ($host, $request) {
 	// Initialize array
-	$response = array("", "", "");
+	$response = array("", '', '');
 
 	// Default is not to use proxy
 	$useProxy = false;
@@ -1932,7 +1928,7 @@ function SEND_RAW_REQUEST ($host, $request) {
 	// Was the request successfull?
 	if ((!eregi("200 OK", $response[0])) || (empty($response[0]))) {
 		// Not found / access forbidden
-		$response = array("", "", "");
+		$response = array("", '', '');
 	} // END - if
 
 	// Return response
@@ -2016,18 +2012,18 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
 }
 
 // Generate an email link
-function CREATE_EMAIL_LINK ($email, $table = "admins") {
+function CREATE_EMAIL_LINK ($email, $table = 'admins') {
 	// Default email link (INSECURE! Spammer can read this by harvester programs)
 	$EMAIL = "mailto:".$email;
 
 	// Check for several extensions
-	if ((EXT_IS_ACTIVE("admins")) && ($table == "admins")) {
+	if ((EXT_IS_ACTIVE('admins')) && ($table == 'admins')) {
 		// Create email link for contacting admin in guest area
 		$EMAIL = ADMINS_CREATE_EMAIL_LINK($email);
-	} elseif ((EXT_IS_ACTIVE("user")) && (GET_EXT_VERSION("user") >= "0.3.3") && ($table == "user_data")) {
+		} elseif ((EXT_IS_ACTIVE('user')) && (GET_EXT_VERSION('user') >= '0.3.3') && ($table == "user_data")) {
 		// Create email link for contacting a member within admin area (or later in other areas, too?)
 		$EMAIL = USER_CREATE_EMAIL_LINK($email);
-	} elseif ((EXT_IS_ACTIVE("sponsor")) && ($table == "sponsor_data")) {
+	} elseif ((EXT_IS_ACTIVE('sponsor')) && ($table == "sponsor_data")) {
 		// Create email link to contact sponsor within admin area (or like the link above?)
 		$EMAIL = SPONSOR_CREATE_EMAIL_LINK($email);
 	}
@@ -2041,8 +2037,8 @@ function CREATE_EMAIL_LINK ($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 (((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (!EXT_IS_ACTIVE("sql_patches"))) && (empty($salt))) {
+	// Is the required extension 'sql_patches' there and a salt is not given?
+	if (((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (!EXT_IS_ACTIVE('sql_patches'))) && (empty($salt))) {
 		// Extension sql_patches is missing/outdated so we hash the plain text with MD5
 		return md5($plainText);
 	} // END - if
@@ -2091,7 +2087,7 @@ function generateHash ($plainText, $salt = "") {
 // Scramble a string
 function scrambleString($str) {
 	// Init
-	$scrambled = "";
+	$scrambled = '';
 
 	// Final check, in case of failture it will return unscrambled string
 	if (strlen($str) > 40) {
@@ -2172,7 +2168,7 @@ function genScrambleString ($len) {
 // normally be stored in cookies
 function ADD_URL_DATA ($URL) {
 	// Init add
-	$ADD = "";
+	$add = '';
 
 	// Determine URL binder
 	$BIND = "?";
@@ -2182,15 +2178,15 @@ function ADD_URL_DATA ($URL) {
 		// Cookies are not accepted
 		if ((REQUEST_ISSET_GET(('refid'))) && (strpos($URL, "refid=") == 0)) {
 			// Cookie found in URL
-			$ADD .= $BIND."refid=".bigintval(REQUEST_GET('refid'));
-		} elseif ((GET_EXT_VERSION("sql_patches") != '') && (getConfig('def_refid') > 0)) {
+			$add .= $BIND."refid=".bigintval(REQUEST_GET('refid'));
+		} elseif ((GET_EXT_VERSION('sql_patches') != '') && (getConfig('def_refid') > 0)) {
 			// Not found! So let's set default here
-			$ADD .= $BIND."refid=".getConfig('def_refid');
+			$add .= $BIND."refid=".getConfig('def_refid');
 		}
 	} // END - if
 
 	// Add all together and return it
-	return $URL . $ADD;
+	return $URL . $add;
 }
 
 // Generate an PGP-like encrypted hash of given hash for e.g. cookies
@@ -2201,7 +2197,7 @@ function generatePassString ($passHash) {
 	// Is a secret key and master salt already initialized?
 	if ((getConfig('secret_key') != "") && (getConfig('master_salt') != "")) {
 		// Only calculate when the secret key is generated
-		$newHash = ""; $start = 9;
+		$newHash = ''; $start = 9;
 		for ($idx = 0; $idx < 10; $idx++) {
 			$part1 = hexdec(substr($passHash, $start, 4));
 			$part2 = hexdec(substr(getConfig('secret_key'), $start, 4));
@@ -2240,22 +2236,25 @@ function FIX_DELETED_COOKIES ($cookies) {
 		foreach ($cookies as $cookieName) {
 			// Is the cookie set to "deleted"?
 			if (get_session($cookieName) == "deleted") {
-				set_session($cookieName, "");
+				set_session($cookieName, '');
 			}
 		} // END - foreach
 	} // END - if
 }
 
 // Output error messages in a fasioned way and die...
-function mxchange_die ($msg) {
+function app_die ($F, $L, $msg) {
 	// Load header
-	LOAD_INC_ONCE("inc/header.php");
+	LOAD_INC_ONCE('inc/header.php');
+
+	// Prepare message for output
+	$msg = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $msg);
 
 	// Load the message template
-	LOAD_TEMPLATE("admin_settings_saved", false, $msg);
+	LOAD_TEMPLATE('admin_settings_saved', false, $msg);
 
 	// Load footer
-	LOAD_INC_ONCE("inc/footer.php");
+	LOAD_INC_ONCE('inc/footer.php');
 
 	// Exit explicitly
 	shutdown();
@@ -2361,7 +2360,7 @@ function GET_CURR_THEME() {
 	if (!isSessionVariableSet('mxchange_theme')) {
 		// Set default theme
 		set_session('mxchange_theme', $ret);
-	} elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION("sql_patches") >= "0.1.4")) {
+	} elseif ((isSessionVariableSet('mxchange_theme')) && (GET_EXT_VERSION('sql_patches') >= '0.1.4')) {
 		//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
 		// Get theme from cookie
 		$ret = get_session('mxchange_theme');
@@ -2371,14 +2370,14 @@ function GET_CURR_THEME() {
 			// Fix it to default
 			$ret = "default";
 		} // END - if
-	} elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET(('theme'))) || (REQUEST_ISSET_POST(('theme'))))) {
+	} elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET('theme')) || (REQUEST_ISSET_POST('theme')))) {
 		// Prepare FQFN for checking
-		$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET(('theme')));
+		$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET('theme'));
 
 		// Installation mode active
-		if ((REQUEST_ISSET_GET(('theme'))) && (FILE_READABLE($theme))) {
+		if ((REQUEST_ISSET_GET('theme')) && (FILE_READABLE($theme))) {
 			// Set cookie from URL data
-			set_session('mxchange_theme', REQUEST_GET(('theme')));
+			set_session('mxchange_theme', REQUEST_GET('theme'));
 		} elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) {
 			// Set cookie from posted data
 			set_session('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme')));
@@ -2403,8 +2402,8 @@ function GET_CURR_THEME() {
 
 // Get id from theme
 function THEME_GET_ID ($name) {
-	// Is the extension "theme" installed?
-	if (!EXT_IS_ACTIVE("theme")) {
+	// Is the extension 'theme' installed?
+	if (!EXT_IS_ACTIVE('theme')) {
 		// Then abort here
 		return 0;
 	} // END - if
@@ -2419,7 +2418,7 @@ function THEME_GET_ID ($name) {
 
 		// Count up
 		incrementConfigEntry('cache_hits');
-	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+	} elseif (GET_EXT_VERSION('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__);
@@ -2452,7 +2451,7 @@ function READ_FILE ($FQFN, $sqlPrepare = false) {
 	// Prepare SQL queries?
 	if ($sqlPrepare === true) {
 		// Remove some unwanted chars
-		$content = str_replace("\r", "", $content);
+		$content = str_replace("\r", '', $content);
 		$content = str_replace("\n\n", "\n", $content);
 	} // END - if
 
@@ -2480,7 +2479,7 @@ function WRITE_FILE ($FQFN, $content) {
 		$return = file_put_contents($FQFN, $content);
 	} else {
 		// Write it with fopen
-		$fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
+		$fp = fopen($FQFN, 'w') or app_die(__FUNCTION__, __LINE__, "Cannot write file ".basename($FQFN)."!");
 		fwrite($fp, $content);
 		fclose($fp);
 
@@ -2495,7 +2494,7 @@ function WRITE_FILE ($FQFN, $content) {
 // Generates an error code from given account status
 function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
 	// Default error code if unknown account status
-	$ERROR = getCode('UNKNOWN_STATUS');
+	$errorCode = getCode('UNKNOWN_STATUS');
 
 	// Generate constant name
 	$constantName = sprintf("ID_%s", $status);
@@ -2503,14 +2502,14 @@ function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
 	// Is the constant there?
 	if (isCodeSet($constantName)) {
 		// Then get it!
-		$ERROR = getCode($constantName);
+		$errorCode = getCode($constantName);
 	} else {
 		// Unknown status
 		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown error status %s detected.", $status));
 	}
 
 	// Return error code
-	return $ERROR;
+	return $errorCode;
 }
 
 // Clears the output buffer. This function does *NOT* backup sent content.
@@ -2526,7 +2525,10 @@ function clearOutputBuffer () {
 function searchDirsRecursive ($dir, &$last_changed) {
 	// Get dir as array
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):dir=".$dir."<br />\n";
-	$ds = GET_DIR_AS_ARRAY($dir, "", true, false);
+	// 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|\.svn|debug\.log|\.cache|config\.php)$@';
+	$ds = GET_DIR_AS_ARRAY($dir, '', true, false, $excludePattern);
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ds[]=".count($ds)."<br />\n";
 
 	// Walk through all entries
@@ -2534,28 +2536,25 @@ function searchDirsRecursive ($dir, &$last_changed) {
 		// Generate proper FQFN
 		$FQFN = str_replace("//", "/", constant('PATH') . $dir. "/". $d);
 
-		// Does it match what we are looking for? (We skip a lot files already!)
-		if (!preg_match('@(\.|\.\.|\.revision|\.svn|debug\.log|\.cache)$@', $d)) {	// no . or  ..  or .revision or .svn in the filename
-			// Is it a file and readable?
-			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):FQFN={$FQFN}<br />\n";
-			if (isDirectory($FQFN)) {
-				 // $FQFN is a directory so also crawl into this directory
-				$newDir = $d;
-				if (!empty($dir)) $newDir = $dir . "/". $d;
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):DESCENT: ".$newDir."<br />\n";
-				searchDirsRecursive($newDir, $last_changed);
-			} elseif (FILE_READABLE($FQFN)) {
-				// $FQFN is a filename and no directory
-				$time = filemtime($FQFN);
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):File: ".$d." found. (".($last_changed['time'] - $time).")<br />\n";
-				if ($last_changed['time'] < $time) {
-					// This file is newer as the file before
-					//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>) - NEWER!<br />\n";
-					$last_changed['path_name'] = $FQFN;
-					$last_changed['time'] = $time;
-				} // END - if
-			}
-		} // END - if
+		// Is it a file and readable?
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):FQFN={$FQFN}<br />\n";
+		if (isDirectory($FQFN)) {
+			 // $FQFN is a directory so also crawl into this directory
+			$newDir = $d;
+			if (!empty($dir)) $newDir = $dir . "/". $d;
+			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):DESCENT: ".$newDir."<br />\n";
+			searchDirsRecursive($newDir, $last_changed);
+		} elseif (FILE_READABLE($FQFN)) {
+			// $FQFN is a filename and no directory
+			$time = filemtime($FQFN);
+			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):File: ".$d." found. (".($last_changed['time'] - $time).")<br />\n";
+			if ($last_changed['time'] < $time) {
+				// This file is newer as the file before
+				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>) - NEWER!<br />\n";
+				$last_changed['path_name'] = $FQFN;
+				$last_changed['time'] = $time;
+			} // END - if
+		}
 	} // END - foreach
 }
 
@@ -2564,12 +2563,12 @@ function getActualVersion ($type = 'Revision') {
 	// By default nothing is new... ;-)
 	$new = false;
 
-	if (EXT_IS_ACTIVE("cache")) {
-		// Check if $_GET['check_revision_data'] is setted (switch for manually rewrite the .revision-File)
-		if (isset($_GET['check_revision_data']) && $_GET['check_revision_data'] == 'yes') $new = true;
+	if (EXT_IS_ACTIVE('cache')) {
+		// Check if REQUEST_GET('check_revision_data') is setted (switch for manually rewrite the .revision-File)
+		if (REQUEST_ISSET_GET('check_revision_data') && REQUEST_GET('check_revision_data') == 'yes') $new = true;
 		if (!isset($GLOBALS['cache_array']['revision'][$type])
 			|| count($GLOBALS['cache_array']['revision']) < 3
-			|| !$GLOBALS['cache_instance']->loadCacheFile("revision")) $new = true;
+			|| !$GLOBALS['cache_instance']->loadCacheFile('revision')) $new = true;
 
 		// Is the cache file outdated/invalid?
 		if ($new === true){
@@ -2579,7 +2578,7 @@ function getActualVersion ($type = 'Revision') {
 			unset($GLOBALS['cache_array']['revision']);
 
 			// Reload load_cach-revison.php
-			LOAD_INC("inc/loader/load_cache-revision.php");
+			LOAD_INC('inc/loader/load_cache-revision.php');
 		} // END - if
 
 		// Return found value
@@ -2591,8 +2590,8 @@ function getActualVersion ($type = 'Revision') {
 		// FQFN of revision file
 		$FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
 
-		// Check if $_GET['check_revision_data'] is setted (switch for manually rewrite the .revision-File)
-		if ((isset($_GET['check_revision_data'])) && ($_GET['check_revision_data'] == 'yes')) {
+		// Check if REQUEST_GET('check_revision_data') is setted (switch for manually rewrite the .revision-File)
+		if ((REQUEST_ISSET_GET('check_revision_data')) && (REQUEST_GET('check_revision_data') == 'yes')) {
 			// Has changed!
 			$new = true;
 		} else {
@@ -2627,6 +2626,7 @@ function getActualVersion ($type = 'Revision') {
 }
 
 // Repares an array we are looking for
+// The returned Array is needed twice (in getAkt_vers() and in getActualVersion() in the old .revision-fallback) so I puted it in an extra function to not polute the global namespace
 function getSearchFor () {
 	// Add Revision, Date, Tag and Author
 	$searchFor = array('Revision', 'Date', 'Tag', 'Author');
@@ -2637,47 +2637,60 @@ function getSearchFor () {
 
 function getAkt_vers () {
 	// Init variables
-	$next_dir = "";
+	$next_dir = ''; // Directory to start with search
 	$last_changed = array(
 		'path_name' => "",
 		'time'      => 0
 	);
-	$akt_vers = array();
-	$res = 0;
+	$akt_vers = array(); // Init return array
+	$res = 0; // Init value for counting the founded keywords
 
 	// Searches all Files and there date of the last modifikation and puts the newest File in $last_changed.
-	searchDirsRecursive($next_dir, $last_changed);
+	searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
 
 	// Get file
 	$last_file = READ_FILE($last_changed['path_name']);
+
+	// Get all the keywords to search for
 	$searchFor = getSearchFor();
 
-	// @TODO What does this loop/regex do? Document it, please.
+	// This foreach loops the $searchFor-Tags (array('Revision', 'Date', 'Tag', 'Author') --> could easaly extended in the future)
 	foreach ($searchFor as $search) {
+		// Searches for "$search-tag:VALUE$" or "$search-tag::VALUE$"(the stylish keywordversion ;-)) in the lates modified file
 		$res += preg_match('@\$'.$search.'(:|::) (.*) \$@U', $last_file, $t);
+		// This trimms the search-result and puts it in the $akt_vers-return array
 		if (isset($t[2])) $akt_vers[$search] = trim($t[2]);
 	} // END - foreach
 
-	if ($res && $res >= 3) {
-		// Prepare content
-		preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d);
+	// Save the last-changed filename for debugging
+	$akt_vers['File'] = $last_changed['path_name'];
+
+	// at least 3 keyword-Tags are needed for propper values
+	if ($res && $res >= 3
+		&& isset($akt_vers['Revision']) && $akt_vers['Revision'] != ''
+		&& isset($akt_vers['Date']) && $akt_vers['Date'] != ''
+		&& isset($akt_vers['Tag']) && $akt_vers['Tag'] != '') {
+		// Prepare content witch need special treadment
 
 		// Prepare timestamp for date
+		preg_match('@(....)-(..)-(..) (..):(..):(..)@', $akt_vers['Date'], $match_d);
 		$akt_vers['Date'] = mktime($match_d[4], $match_d[5], $match_d[6], $match_d[2], $match_d[3], $match_d[1]);
 
-		// Add Tag if the author is set and is not quix0r (lead coder)
+		// Add author to the Tag if the author is set and is not quix0r (lead coder)
 		if ((isset($akt_vers['Author'])) && ($akt_vers['Author'] != "quix0r")) {
 			$akt_vers['Tag'] .= '-'.strtoupper($akt_vers['Author']);
 		} // END - if
+
 	} else {
-		// No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Could be removed I think.
+		// No valid Data from the last modificated file so read the Revision from the Server. Fallback-solution!! Should not be removed I think.
 		$version = GET_URL("check-updates3.php");
 
 		// Prepare content
-		$akt_vers['Revision'] = trim($version[10]);
-		$akt_vers['Date']     = trim($version[9]);
-		$akt_vers['Tag']      = trim($version[8]);
-		$akt_vers['Author']   = "quix0r";
+		// Only sets not setted or not proper values to the Online-Server-Fallback-Solution
+		if (!isset($akt_vers['Revision']) || $akt_vers['Revision'] == '') $akt_vers['Revision'] = trim($version[10]);
+		if (!isset($akt_vers['Date'])     || $akt_vers['Date']     == '') $akt_vers['Date']     = trim($version[9]);
+		if (!isset($akt_vers['Tag'])      || $akt_vers['Tag']      == '') $akt_vers['Tag']      = trim($version[8]);
+		if (!isset($akt_vers['Author'])   || $akt_vers['Author']   == '') $akt_vers['Author']   = "quix0r";
 	}
 
 	// Return prepared array
@@ -2691,7 +2704,7 @@ function LOAD_INC ($INC) {
 	$FQFN = constant('PATH') . $INC;
 
 	// Is the include file there?
-	if (!FILE_READABLE($FQFN)) {
+	if (!INCLUDE_READABLE($INC)) {
 		// Not there so log it
 		debug_report_bug(sprintf("Include file %s not found.", $INC));
 		return false;
@@ -2737,7 +2750,7 @@ function debug_get_printable_backtrace () {
 // Output a debug backtrace to the user
 function debug_report_bug ($message = "") {
 	// Init message
-	$debug = "";
+	$debug = '';
 	// Is the optional message set?
 	if (!empty($message)) {
 		// Use and log it
@@ -2750,12 +2763,13 @@ function debug_report_bug ($message = "") {
 	} // END - if
 
 	// Add output
-	$debug .= "Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>";
+	$debug .= "Please report this bug at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>";
 	$debug .= debug_get_printable_backtrace();
-	$debug .= "</pre>Thank you for finding bugs.";
+	$debug .= "</pre>Request-URI: ".$_SERVER['REQUEST_URI']."<br />\n";
+	$debug .= "Thank you for finding bugs.";
 
 	// And abort here
-	// @TODO This cannot be rewritten to mxchange_die(), try to find a solution for this.
+	// @TODO This cannot be rewritten to app_die(), try to find a solution for this.
 	die($debug);
 }
 
@@ -2767,7 +2781,7 @@ function generateSeed () {
 
 // Converts a message code to a human-readable message
 function convertCodeToMessage ($code) {
-	$msg = "";
+	$msg = '';
 	switch ($code) {
 		case getCode('LOGOUT_DONE')      : $msg = getMessage('LOGOUT_DONE'); break;
 		case getCode('LOGOUT_FAILED')    : $msg = "<span class=\"guest_failed\">{--LOGOUT_FAILED--}</span>"; break;
@@ -2782,7 +2796,7 @@ function convertCodeToMessage ($code) {
 			if (EXT_IS_ACTIVE($ext, true)) {
 				$msg = getMessage('ERROR_CONFIRMING_MAIL');
 			} else {
-				$msg = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "mailid");
+				$msg = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'mailid');
 			}
 			break;
 
@@ -2812,33 +2826,25 @@ function convertCodeToMessage ($code) {
 	return $msg;
 }
 
-// Checks wether the given extension is currently not installed
-// and redirects if so.
-function REDIRCT_ON_UNINSTALLED_EXTENSION ($ext_name) {
-	// Is the extension uninstalled/inactive?
-	if (!EXT_IS_ACTIVE($ext_name)) {
-		// Redirect to index
-		LOAD_URL("modules.php?module=index&amp;msg=".getCode('EXTENSION_PROBLEM')."&amp;ext=".$ext_name);
-	} // END - if
-}
-
 // Generate a "link" for the given admin id (aid)
 function GENERATE_AID_LINK ($aid) {
 	// No assigned admin is default
 	$admin = "<span class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>";
 
 	// Zero? = Not assigned
-	if ($aid > 0) {
+	if (bigintval($aid) > 0) {
 		// Load admin's login
 		$login = GET_ADMIN_LOGIN($aid);
+
+		// Is the login valid?
 		if ($login != "***") {
 			// Is the extension there?
-			if (EXT_IS_ACTIVE("admins")) {
+			if (EXT_IS_ACTIVE('admins')) {
 				// Admin found
 				$admin = "<a href=\"".ADMINS_CREATE_EMAIL_LINK(GET_ADMIN_EMAIL($aid))."\">".$login."</a>";
 			} else {
 				// Extension not found
-				$admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "admins");
+				$admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
 			}
 		} else {
 			// Maybe deleted?
@@ -2898,7 +2904,7 @@ function compileUriCode ($code, $simple=true) {
 // Function taken from user comments on www.php.net / function eregi()
 function isUrlValid ($url) {
 	// Prepare URL
-	$url = strip_tags(str_replace("\\", "", compileUriCode(urldecode($url))));
+	$url = strip_tags(str_replace("\\", '', compileUriCode(urldecode($url))));
 
 	// Allows http and https
 	$http      = "(http|https)+(:\/\/)";
@@ -2964,7 +2970,7 @@ function isUrlValid ($url) {
 
 // Smartly adds slashes
 function smartAddSlashes ($unquoted) {
-	$unquoted = str_replace("\\", "", $unquoted);
+	$unquoted = str_replace("\\", '', $unquoted);
 	return addslashes($unquoted);
 }
 
@@ -3050,7 +3056,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 }
 // Send notification to admin
 function SEND_ADMIN_NOTIFICATION ($subject, $templateName, $content=array(), $uid="0") {
-	if (GET_EXT_VERSION("admins") >= "0.4.1") {
+	if (GET_EXT_VERSION('admins') >= '0.4.1') {
 		// Send new way
 		SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);
 	} else {
@@ -3085,69 +3091,19 @@ function DEBUG_LOG ($funcFile, $line, $message, $force=true) {
 	// Is debug mode enabled?
 	if ((isDebugModeEnabled()) || ($force === true)) {
 		// Remove CRLF
-		$message = str_replace("\r", "", str_replace("\n", "", $message));
+		$message = str_replace("\r", '', str_replace("\n", '', $message));
 
 		// Log this message away
-		$fp = fopen(constant('PATH')."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!");
-		fwrite($fp, date("d.m.Y|H:i:s", time())."|".basename($funcFile)."|".$line."|".strip_tags($message)."\n");
+		$fp = fopen(constant('PATH')."inc/cache/debug.log", 'a') or app_die(__FUNCTION__, __LINE__, "Cannot write logfile debug.log!");
+		fwrite($fp, date("d.m.Y|H:i:s", time())."|".$GLOBALS['module']."|".basename($funcFile)."|".$line."|".strip_tags($message)."\n");
 		fclose($fp);
 	} // END - if
 }
 
-// Reads a directory with PHP files in and gets only files back
-function GET_DIR_AS_ARRAY ($baseDir, $prefix, $includeDirs = false, $addBaseDir = true) {
-	// Init includes
-	$INCs = array();
-
-	// Open directory
-	$dirPointer = opendir(constant('PATH') . $baseDir) or mxchange_die("Cannot read ".basename($baseDir)." path!");
-
-	// Read all entries
-	while ($baseFile = readdir($dirPointer)) {
-		// Construct include filename and FQFN
-		$INC = $baseDir . "/" . $baseFile;
-		$FQFN = constant('PATH') . $INC;
-
-		// Is this a valid reset file?
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):baseDir={$baseDir},prefix={$prefix},baseFile={$baseFile}<br />\n";
-		if (((FILE_READABLE($FQFN)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) || (($includeDirs) && (isDirectory($FQFN)))) {
-			// Remove both for extension name
-			$extName = substr($baseFile, strlen($prefix), -4);
-
-			// Try to find it
-			$extId = GET_EXT_ID($extName);
-
-			// Is the extension valid and active?
-			if (($extId > 0) && (EXT_IS_ACTIVE($extName))) {
-				// Then add this file
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Extension entry ".$baseFile." added.<br />\n";
-				$INCs[] = $INC;
-			} elseif ($extId == 0) {
-				// Add non-extension files as well
-				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): Regular entry ".$baseFile." added.<br />\n";
-				if ($addBaseDir) {
-					$INCs[] = $INC;
-				} else {
-					$INCs[] = $baseFile;
-				}
-			}
-		} // END - if
-	} // END - while
-
-	// Close directory
-	closedir($dirPointer);
-
-	// Sort array
-	asort($INCs);
-
-	// Return array with include files
-	return $INCs;
-}
-
 // Load more reset scripts
 function runResetIncludes () {
 	// Is the reset set or old sql_patches?
-	if ((!isResetModeEnabled()) || (EXT_VERSION_IS_OLDER("sql_patches", "0.4.5"))) {
+	if ((!isResetModeEnabled()) || (EXT_VERSION_IS_OLDER('sql_patches', '0.4.5'))) {
 		// Then abort here
 		DEBUG_LOG(__FUNCTION__, __LINE__, "Cannot run reset! Please report this bug. Thanks");
 	} // END - if
@@ -3159,7 +3115,7 @@ function runResetIncludes () {
 	if (!defined('DEBUG_RESET')) UPDATE_CONFIG("last_update", time());
 
 	// Is the config entry set?
-	if (GET_EXT_VERSION("sql_patches") >= "0.4.2") {
+	if (GET_EXT_VERSION('sql_patches') >= '0.4.2') {
 		// Create current week mark
 		$currWeek = date("W", time());
 
@@ -3231,7 +3187,7 @@ function FILE_READABLE ($FQFN) {
 // Converts timestamp selections into a timestamp
 function CONVERT_SELECTIONS_TO_TIMESTAMP (&$POST, &$DATA, &$id, &$skip) {
 	// Init test variable
-	$test2 = "";
+	$test2 = '';
 
 	// Get last three chars
 	$test = substr($id, -3);
@@ -3256,7 +3212,7 @@ function CONVERT_SELECTIONS_TO_TIMESTAMP (&$POST, &$DATA, &$id, &$skip) {
 	} else {
 		// Process this entry
 		$skip = false;
-		$test2 = "";
+		$test2 = '';
 	}
 }
 
@@ -3269,7 +3225,7 @@ function REVERT_COMMA ($str) {
 	switch (GET_LANGUAGE()) {
 		case "de": // German language
 			// Remove german thousand dots first
-			$str = str_replace(".", "", $str);
+			$str = str_replace(".", '', $str);
 
 			// Replace german commata with decimal dot and cast it
 			$float = (float)str_replace(",", ".", $str);
@@ -3277,7 +3233,7 @@ function REVERT_COMMA ($str) {
 
 		default: // US and so on
 			// Remove thousand dots first and cast
-			$float = (float)str_replace(",", "", $str);
+			$float = (float)str_replace(",", '', $str);
 			break;
 	}
 
@@ -3288,7 +3244,7 @@ function REVERT_COMMA ($str) {
 // Handle menu-depending failed logins and return the rendered content
 function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 	// Default output is empty ;-)
-	$OUT = "";
+	$OUT = '';
 
 	// Is the session data set?
 	if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
@@ -3306,8 +3262,8 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 		} // END - if
 
 		// Reset session data
-		set_session('mxchange_'.$accessLevel.'_failures', "");
-		set_session('mxchange_'.$accessLevel.'_last_fail', "");
+		set_session('mxchange_'.$accessLevel.'_failures', '');
+		set_session('mxchange_'.$accessLevel.'_last_fail', '');
 	} // END - if
 
 	// Return rendered content
@@ -3317,7 +3273,7 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 // Rebuild cache
 function rebuildCacheFiles ($cache, $inc="") {
 	// Shall I remove the cache file?
-	if ((EXT_IS_ACTIVE("cache")) && (isCacheInstanceValid())) {
+	if ((EXT_IS_ACTIVE('cache')) && (isCacheInstanceValid())) {
 		// Rebuild cache
 		if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
 			// Destroy it
@@ -3345,14 +3301,14 @@ function rebuildCacheFiles ($cache, $inc="") {
 // Purge admin menu cache
 function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
 	// Is the cache extension enabled or no cache instance or admin menu cache disabled?
-	if (!EXT_IS_ACTIVE("cache")) {
+	if (!EXT_IS_ACTIVE('cache')) {
 		// Cache extension not active
 		return false;
 	} elseif (!isCacheInstanceValid()) {
 		// No cache instance!
 		DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found.");
 		return false;
-	} elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != "Y")) {
+	} elseif ((!isConfigEntrySet('cache_admin_menu')) || (getConfig('cache_admin_menu') != 'Y')) {
 		// Caching disabled (currently experiemental!)
 		return false;
 	}
@@ -3363,7 +3319,7 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
 
 // Translates the "pool type" into human-readable
 function TRANSLATE_POOL_TYPE ($type) {
-	// Default type is unknown
+	// Default?type is unknown
 	$translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
 
 	// Generate constant
@@ -3379,13 +3335,37 @@ function TRANSLATE_POOL_TYPE ($type) {
 	return $translated;
 }
 
+// Determines the real remote address
+function determineRealRemoteAddress () {
+	// Is a proxy in use?
+	if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
+		// Proxy was used
+		$address = $_SERVER['HTTP_X_FORWARDED_FOR'];
+	} elseif (isset($_SERVER['HTTP_CLIENT_IP'])){
+		// Yet, another proxy
+		$address = $_SERVER['HTTP_CLIENT_IP'];
+	} else {
+		// The regular address when no proxy was used
+		$address = $_SERVER['REMOTE_ADDR'];
+	}
+
+	// This strips out the real address from proxy output
+	if (strstr($address, ",")){
+		$addressArray = explode(",", $address);
+		$address = $addressArray[0];
+	} // END - if
+
+	// Return the result
+	return $address;
+}
+
 // "Getter" for remote IP number
 function GET_REMOTE_ADDR () {
 	// Get remote ip from environment
-	$remoteAddr = getenv('REMOTE_ADDR');
+	$remoteAddr = determineRealRemoteAddress();
 
 	// Is removeip installed?
-	if (EXT_IS_ACTIVE("removeip")) {
+	if (EXT_IS_ACTIVE('removeip')) {
 		// Then anonymize it
 		$remoteAddr = GET_ANONYMOUS_REMOTE_ADDR($remoteAddr);
 	} // END - if
@@ -3400,7 +3380,7 @@ function GET_REMOTE_HOST () {
 	$remoteHost = getenv('REMOTE_HOST');
 
 	// Is removeip installed?
-	if (EXT_IS_ACTIVE("removeip")) {
+	if (EXT_IS_ACTIVE('removeip')) {
 		// Then anonymize it
 		$remoteHost = GET_ANONYMOUS_REMOTE_HOST($remoteHost);
 	} // END - if
@@ -3415,7 +3395,7 @@ function GET_USER_AGENT () {
 	$userAgent = getenv('HTTP_USER_AGENT');
 
 	// Is removeip installed?
-	if (EXT_IS_ACTIVE("removeip")) {
+	if (EXT_IS_ACTIVE('removeip')) {
 		// Then anonymize it
 		$userAgent = GET_ANONYMOUS_USER_AGENT($userAgent);
 	} // END - if
@@ -3430,7 +3410,7 @@ function GET_REFERER () {
 	$referer = getenv('HTTP_REFERER');
 
 	// Is removeip installed?
-	if (EXT_IS_ACTIVE("removeip")) {
+	if (EXT_IS_ACTIVE('removeip')) {
 		// Then anonymize it
 		$referer = GET_ANONYMOUS_REFERER($referer);
 	} // END - if
@@ -3464,10 +3444,10 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
 		);
 
 		// Mail inserted into bonus pool
-		if ($output) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_SEND'));
+		if ($output) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_SEND'));
 	} elseif ($output) {
 		// More entered than can be reached!
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_MORE_SELECTED'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_MORE_SELECTED'));
 	} else {
 		// Debug log
 		DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
@@ -3492,10 +3472,10 @@ function DETERMINE_REFID () {
 	} elseif ((isSessionVariableSet('refid')) && (get_session('refid') != 0)) {
 		// Set session refid als global
 		$GLOBALS['refid'] = bigintval(get_session('refid'));
-	} elseif ((GET_EXT_VERSION("sql_patches") != "") && (getConfig('def_refid') > 0)) {
+	} elseif ((GET_EXT_VERSION('sql_patches') != "") && (getConfig('def_refid') > 0)) {
 		// Set default refid as refid in URL
 		$GLOBALS['refid'] = getConfig(('def_refid'));
-	} elseif ((GET_EXT_VERSION("user") >= "0.3.4") && (getConfig('select_user_zero_refid')) == "Y") {
+	} elseif ((GET_EXT_VERSION('user') >= '0.3.4') && (getConfig('select_user_zero_refid')) == 'Y') {
 		// Select a random user which has confirmed enougth mails
 		$GLOBALS['refid'] = SELECT_RANDOM_REFID();
 	} else {
@@ -3611,51 +3591,6 @@ function isDirectory ($FQFN) {
 	return $isDirectory;
 }
 
-// Init INC_POOL
-function INIT_INC_POOL () {
-	$GLOBALS['inc_pool'] = array();
-}
-
-// Setter for INC_POOL
-function SET_INC_POOL ($includePool) {
-	$GLOBALS['inc_pool'] = (array) $includePool;
-}
-
-// Getter for INC_POOL
-function GET_INC_POOL () {
-	return $GLOBALS['inc_pool'];
-}
-
-// Count INC_POOL
-function COUNT_INC_POOL () {
-	return count($GLOBALS['inc_pool']);
-}
-
-// Merge INC_POOL into given
-function MERGE_INC_POOL ($includePool) {
-	SET_INC_POOL(merge_array(GET_INC_POOL(), $includePool));
-}
-
-// Add single include file to INC_POOL
-function ADD_INC_TO_POOL ($INC) {
-	$GLOBALS['inc_pool'][] = (string) $INC;
-}
-
-// Remove an include file from INC_POOL
-function REMOVE_INC_FROM_POOL ($INC) {
-	// First look it up
-	$key = array_search($INC, GET_INC_POOL());
-
-	// Is it valid?
-	if ($key !== false) {
-		// Then remove it
-		unset($GLOBALS['inc_pool'][$key]);
-
-		// And sort the list
-		asort($GLOBALS['inc_pool']);
-	} // END - if
-}
-
 // Handle message codes from URL
 function handleCodeMessage () {
 	if (REQUEST_ISSET_GET(('msg'))) {