X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=637412fc66ae8626244eebb5df5c42150225fc59;hp=d96e2dbf60f3bc90cae02d3b6edc12a32aaa5c70;hb=3203112d9be14c2df49bd6b3b618b17fd950cc09;hpb=65662f1e3a5d984fb918c8eff0ecc8b5f51790b1

diff --git a/inc/functions.php b/inc/functions.php
index d96e2dbf60..637412fc66 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -37,11 +37,11 @@
  ************************************************************************/
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-// Output HTML code directly or "render" it. You addionally switch the new-line character off
+// Output HTML code directly or 'render' it. You addionally switch the new-line character off
 function OUTPUT_HTML ($HTML, $newLine = true) {
 	// Some global variables
 	global $OUTPUT;
@@ -49,41 +49,40 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 	// Do we have HTML-Code here?
 	if (!empty($HTML)) {
 		// Yes, so we handle it as you have configured
-		switch (constant('OUTPUT_MODE'))
+		switch (getConfig('OUTPUT_MODE'))
 		{
-		case "render":
-			// That's why you don't need any \n at the end of your HTML code... :-)
-			if (constant('_OB_CACHING') == "on") {
-				// Output into PHP's internal buffer
-				OUTPUT_RAW($HTML);
-
+			case 'render':
 				// That's why you don't need any \n at the end of your HTML code... :-)
-				if ($newLine) echo "\n";
-			} else {
-				// Render mode for old or lame servers...
-				$OUTPUT .= $HTML;
+				if (constant('_OB_CACHING') == 'on') {
+					// Output into PHP's internal buffer
+					outputRawCode($HTML);
 
-				// That's why you don't need any \n at the end of your HTML code... :-)
-				if ($newLine) $OUTPUT .= "\n";
-			}
-			break;
+					// That's why you don't need any \n at the end of your HTML code... :-)
+					if ($newLine) echo "\n";
+				} else {
+					// Render mode for old or lame servers...
+					$OUTPUT .= $HTML;
 
-		case "direct":
-			// If we are switching from render to direct output rendered code
-			if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != "on")) { OUTPUT_RAW($OUTPUT); $OUTPUT = ''; }
+					// That's why you don't need any \n at the end of your HTML code... :-)
+					if ($newLine) $OUTPUT .= "\n";
+				}
+				break;
 
-			// The same as above... ^
-			OUTPUT_RAW($HTML);
-			if ($newLine) echo "\n";
-			break;
+			case 'direct':
+				// If we are switching from render to direct output rendered code
+				if ((!empty($OUTPUT)) && (constant('_OB_CACHING') != 'on')) { outputRawCode($OUTPUT); $OUTPUT = ''; }
 
-		default:
-			// Huh, something goes wrong or maybe you have edited config.php ???
-			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
-			app_die(__FUNCTION__, __LINE__, "<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}");
-			break;
+				// The same as above... ^
+				outputRawCode($HTML);
+				if ($newLine) echo "\n";
+				break;
+
+			default:
+				// Huh, something goes wrong or maybe you have edited config.php ???
+				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)) {
+	} elseif ((constant('_OB_CACHING') == 'on') && (isset($GLOBALS['footer_sent'])) && ($GLOBALS['footer_sent'] == 1)) {
 		// Headers already sent?
 		if (headers_sent()) {
 			// Log this error
@@ -102,21 +101,21 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 		} // END - if
 
 		// Send HTTP header
-		header("HTTP/1.1 200");
+		sendHeader('HTTP/1.1 200');
 
 		// Used later
 		$now = gmdate('D, d M Y H:i:s') . ' GMT';
 
 		// General headers for no caching
-		header("Expired: " . $now); // RFC2616 - Section 14.21
-		header("Last-Modified: " . $now);
-		header("Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0"); // HTTP/1.1
-		header("Pragma: no-cache"); // HTTP/1.0
-		header("Connection: Close");
+		sendHeader('Expired: ' . $now); // RFC2616 - Section 14.21
+		sendHeader('Last-Modified: ' . $now);
+		sendHeader('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+		sendHeader('Pragma: no-cache'); // HTTP/1.0
+		sendHeader('Connection: Close');
 
 		// Extension 'rewrite' installed?
-		if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
-			$OUTPUT = REWRITE_LINKS($OUTPUT);
+		if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
+			$OUTPUT = rewriteLinksInCode($OUTPUT);
 		} // END - if
 
 		// Compile and run finished rendered HTML code
@@ -135,11 +134,11 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 		} // END - while
 
 		// Output code here, DO NOT REMOVE! ;-)
-		OUTPUT_RAW($OUTPUT);
-	} elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {
+		outputRawCode($OUTPUT);
+	} elseif ((getConfig('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")) {
-			$OUTPUT = REWRITE_LINKS($OUTPUT);
+		if ((EXT_IS_ACTIVE('rewrite')) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) {
+			$OUTPUT = rewriteLinksInCode($OUTPUT);
 		} // END - if
 
 		// Compile and run finished rendered HTML code
@@ -149,17 +148,17 @@ function OUTPUT_HTML ($HTML, $newLine = true) {
 		} // END - while
 
 		// Output code here, DO NOT REMOVE! ;-)
-		OUTPUT_RAW($OUTPUT);
+		outputRawCode($OUTPUT);
 	}
 }
 
 // Output the raw HTML code
-function OUTPUT_RAW ($HTML) {
+function outputRawCode ($HTML) {
 	// Output stripped HTML code to avoid broken JavaScript code, etc.
 	echo stripslashes(stripslashes($HTML));
 
-	// Flush the output if only constant('_OB_CACHING') is not "on"
-	if (constant('_OB_CACHING') != "on") {
+	// Flush the output if only constant('_OB_CACHING') is not 'on'
+	if (constant('_OB_CACHING') != 'on') {
 		// Flush it
 		flush();
 	} // END - if
@@ -177,7 +176,6 @@ function getFatalArray () {
 
 // Add a fatal error message to the queue array
 function addFatalMessage ($F, $L, $message, $extra='') {
-	debug_report_bug($message);
 	if (is_array($extra)) {
 		// Multiple extras for a message with masks
 		$message = call_user_func_array('sprintf', $extra);
@@ -223,9 +221,9 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	incrementConfigEntry('num_templates');
 
 	// Prepare IP number and User Agent
-	$REMOTE_ADDR     = GET_REMOTE_ADDR();
+	$REMOTE_ADDR     = detectRemoteAddr();
 	if (!defined('REMOTE_ADDR')) define('REMOTE_ADDR', $REMOTE_ADDR);
-	$HTTP_USER_AGENT = GET_USER_AGENT();
+	$HTTP_USER_AGENT = detectUserAgent();
 
 	// Init some data
 	$ret = '';
@@ -235,7 +233,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	if ($template == "member_support_form") {
 		// Support request of a member
 		$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-			array(getUserId()), __FUNCTION__, __LINE__);
+		array(getUserId()), __FUNCTION__, __LINE__);
 
 		// Is content an array?
 		if (is_array($content)) {
@@ -243,7 +241,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 			$content = merge_array($content, SQL_FETCHARRAY($result));
 
 			// Translate gender
-			$content['gender'] = TRANSLATE_GENDER($content['gender']);
+			$content['gender'] = translateGender($content['gender']);
 		} else {
 			// @DEPRECATED
 			// @TODO Fine all templates which are using these direct variables and rewrite them.
@@ -251,7 +249,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 			list($gender, $surname, $family, $email) = SQL_FETCHROW($result);
 
 			// Translate gender
-			$gender = TRANSLATE_GENDER($gender);
+			$gender = translateGender($gender);
 			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array (%s).", gettype($content)));
 		}
 
@@ -260,10 +258,10 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	} // END - if
 
 	// Generate date/time string
-	$date_time = MAKE_DATETIME(time(), "1");
+	$date_time = generateDateTime(time(), '1');
 
 	// Base directory
-	$basePath = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
+	$basePath = sprintf("%stemplates/%s/html/", constant('PATH'), getLanguage());
 	$mode = '';
 
 	// Check for admin/guest/member templates
@@ -290,7 +288,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 		$test = substr($template, 0, strpos($template, "_"));
 		if (EXT_IS_ACTIVE($test)) {
 			// Set extra path to extension's name
-			$mode = $test."/";
+			$mode = $test.'/';
 		}
 	}
 
@@ -302,29 +300,29 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	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",
-			$basePath,
-			$mode,
-			$template,
-			SQL_ESCAPE($GLOBALS['what'])
+		$basePath,
+		$mode,
+		$template,
+		SQL_ESCAPE($GLOBALS['what'])
 		);
 
 		// Probe for it...
-		if (FILE_READABLE($file2)) $FQFN = $file2;
+		if (isFileReadable($file2)) $FQFN = $file2;
 
 		// Remove variable from memory
 		unset($file2);
 	}
 
 	// Does the special template exists?
-	if (!FILE_READABLE($FQFN)) {
+	if (!isFileReadable($FQFN)) {
 		// Reset to default template
 		$FQFN = $basePath.$template.".tpl";
 	} // END - if
 
 	// Now does the final template exists?
-	if (FILE_READABLE($FQFN)) {
+	if (isFileReadable($FQFN)) {
 		// The local file does exists so we load it. :)
-		$tmpl_file = READ_FILE($FQFN);
+		$tmpl_file = readFromFile($FQFN);
 
 		// Replace ' to our own chars to preventing them being quoted
 		while (strpos($tmpl_file, "'") !== false) { $tmpl_file = str_replace("'", '{QUOT}', $tmpl_file); }
@@ -344,12 +342,12 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 		$ret = "<!-- Template ".$template." - Start -->\n".$ret."<!-- Template ".$template." - End -->\n";
 	} elseif ((IS_ADMIN()) || ((isInstalling()) && (!isInstalled()))) {
 		// Only admins shall see this warning or when installation mode is active
-		$ret = "<br /><span class=\"guest_failed\">".TEMPLATE_404."</span><br />
+		$ret = "<br /><span class=\"guest_failed\">{--TEMPLATE_404--}</span><br />
 (".basename($FQFN).")<br />
 <br />
-".TEMPLATE_CONTENT."
+{--TEMPLATE_CONTENT--}
 <pre>".print_r($content, true)."</pre>
-".TEMPLATE_DATA."
+{--TEMPLATE_DATA--}
 <pre>".print_r($DATA, true)."</pre>
 <br /><br />";
 	}
@@ -375,7 +373,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 }
 
 // Send mail out to an email address
-function SEND_EMAIL($toEmail, $subject, $message, $HTML = "N", $mailHeader = "") {
+function sendEmail($toEmail, $subject, $message, $HTML = 'N', $mailHeader = '') {
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$toEmail},SUBJECT={$subject}<br />\n";
 
 	// Compile subject line (for POINTS constant etc.)
@@ -405,14 +403,14 @@ function SEND_EMAIL($toEmail, $subject, $message, $HTML = "N", $mailHeader = "")
 			// Free result
 			SQL_FREERESULT($result_email);
 		}
-	} elseif ("$toEmail" == "0") {
+	} elseif ("$toEmail" == '0') {
 		// Is the webmaster!
 		$toEmail = constant('WEBMASTER');
 	}
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$toEmail}<br />\n";
 
 	// Check for PHPMailer or debug-mode
-	if (!CHECK_PHPMAILER_USAGE()) {
+	if (!checkPhpMailerUsage()) {
 		// Not in PHPMailer-Mode
 		if (empty($mailHeader)) {
 			// Load email header template
@@ -440,7 +438,7 @@ function SEND_EMAIL($toEmail, $subject, $message, $HTML = "N", $mailHeader = "")
 	eval($eval);
 
 	// Fix HTML parameter (default is no!)
-	if (empty($HTML)) $HTML = "N";
+	if (empty($HTML)) $HTML = 'N';
 	if (isDebugModeEnabled()) {
 		// In debug mode we want to display the mail instead of sending it away so we can debug this part
 		print("<pre>
@@ -451,32 +449,30 @@ Message : ".$message."
 </pre>\n");
 	} elseif (($HTML == 'Y') && (EXT_IS_ACTIVE('html_mail'))) {
 		// Send mail as HTML away
-		SEND_HTML_EMAIL($toEmail, $subject, $message, $mailHeader);
+		sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
 	} elseif (!empty($toEmail)) {
 		// Send Mail away
-		SEND_RAW_EMAIL($toEmail, $subject, $message, $mailHeader);
+		sendRawEmail($toEmail, $subject, $message, $mailHeader);
 	} elseif ($HTML == 'N') {
 		// Problem found!
-		SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$subject, $message, $mailHeader);
+		sendRawEmail(constant('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
 	}
 }
 
 // Check if legacy or PHPMailer command
 // @TODO Rewrite this to an extension 'smtp'
 // @private
-function CHECK_PHPMAILER_USAGE() {
-	return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (constant('SMTP_HOSTNAME') != "") && (constant('SMTP_USER') != ""));
+function checkPhpMailerUsage() {
+	return ((getConfig('SMTP_HOSTNAME') != '') && (getConfig('SMTP_USER') != ''));
 }
 
-/*
- * Send out a raw email with PHPMailer class or legacy mail() command
- */
-function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
+// Send out a raw email with PHPMailer class or legacy mail() command
+function sendRawEmail ($toEmail, $subject, $msg, $from) {
 	// Shall we use PHPMailer class or legacy mode?
-	if (CHECK_PHPMAILER_USAGE()) {
+	if (checkPhpMailerUsage()) {
 		// Use PHPMailer class with SMTP enabled
-		LOAD_INC_ONCE("inc/phpmailer/class.phpmailer.php");
-		LOAD_INC_ONCE("inc/phpmailer/class.smtp.php");
+		loadIncludeOnce('inc/phpmailer/class.phpmailer.php');
+		loadIncludeOnce('inc/phpmailer/class.smtp.php');
 
 		// get new instance
 		$mail = new PHPMailer();
@@ -484,10 +480,10 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
 
 		$mail->IsSMTP();
 		$mail->SMTPAuth   = true;
-		$mail->Host       = constant('SMTP_HOSTNAME');
+		$mail->Host       = getConfig('SMTP_HOSTNAME');
 		$mail->Port       = 25;
-		$mail->Username   = constant('SMTP_USER');
-		$mail->Password   = constant('SMTP_PASSWORD');
+		$mail->Username   = getConfig('SMTP_USER');
+		$mail->Password   = getConfig('SMTP_PASSWORD');
 		if (empty($from)) {
 			$mail->From = constant('WEBMASTER');
 		} else {
@@ -497,7 +493,7 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
 		$mail->Subject    = $subject;
 		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->AltBody    = 'Your mail program required HTML support to read this mail!';
 			$mail->WordWrap   = 70;
 			$mail->IsHTML(true);
 		} else {
@@ -505,23 +501,22 @@ function SEND_RAW_EMAIL ($toEmail, $subject, $msg, $from) {
 		}
 		$mail->AddAddress($toEmail, '');
 		$mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
-		$mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
-		$mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
+		$mail->AddCustomHeader('Errors-To:' . constant('WEBMASTER'));
+		$mail->AddCustomHeader('X-Loop:' . constant('WEBMASTER'));
 		$mail->Send();
 	} else {
 		// Use legacy mail() command
 		@mail($toEmail, $subject, decodeEntities($msg), $from);
 	}
 }
-//
 
 // Generate a password in a specified length or use default password length
-function GEN_PASS ($LEN = 0) {
+function generatePassword ($LEN = 0) {
 	// Auto-fix invalid length of zero
 	if ($LEN == 0) $LEN = getConfig('pass_len');
 
 	// Initialize array with all allowed chars
-	$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,-,+,_,/");
+	$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 = '';
@@ -529,7 +524,8 @@ function GEN_PASS ($LEN = 0) {
 		$PASS .= $ABC[mt_rand(0, count($ABC) -1)];
 	} // END - for
 
-	// When the size is below 40 we can also add additional security by scrambling it
+	// When the size is below 40 we can also add additional security by scrambling
+	// it. Otherwise we may corrupt hashes
 	if (strlen($PASS) <= 40) {
 		// Also scramble the password
 		$PASS = scrambleString($PASS);
@@ -538,49 +534,85 @@ function GEN_PASS ($LEN = 0) {
 	// Return the password
 	return $PASS;
 }
-//
-function MAKE_DATETIME ($time, $mode="0")
-{
+
+// Generates a human-readable timestamp from the Uni* stamp
+function generateDateTime ($time, $mode = '0') {
+	// Filter out numbers
+	$time = bigintval($time);
+
+	// If the stamp is zero it mostly didn't "happen"
 	if ($time == 0) {
 		// Never happend
-		return NEVER_HAPPENED;
-	} else {
-		// Filter out numbers
-		$time = bigintval($time);
-	}
+		return getMessage('NEVER_HAPPENED');
+	} // END - if
 
-	switch (GET_LANGUAGE())
+	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;
-			default:
-				DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
-				break;
-		}
-		break;
-
-	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;
-			default:
-				DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
-				break;
-		}
+		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;
+				default:
+					DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+					break;
+			}
+			break;
+
+				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;
+						default:
+							DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
+							break;
+					}
 	}
 	return $ret;
 }
 
+// Translates Y/N to yes/no
+function translateYesNo ($yn) {
+	// Default
+	$translated = "??? (".$yn.')';
+	switch ($yn) {
+		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));
+			break;
+	}
+
+	// Return it
+	return $translated;
+}
+
+// Translates the "pool type" into human-readable
+function translatePoolType ($type) {
+	// Default?type is unknown
+	$translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
+
+	// Generate constant
+	$constName = sprintf("POOL_TYPE_%s", $type);
+
+	// Does it exist?
+	if (defined($constName)) {
+		// Then use it
+		$translated = getMessage($constName);
+	} // END - if
+
+	// Return "translation"
+	return $translated;
+}
+
 // Translates the american decimal dot into a german comma
-function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
+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');
@@ -591,7 +623,7 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
 	// Cut zeros off?
 	if (($cut) && ($max == 0)) {
 		// Test for commata if in cut-mode
-		$com = explode(".", $dotted);
+		$com = explode('.', $dotted);
 		if (count($com) < 2) {
 			// Don't display commatas even if there are none... ;-)
 			$maxComma = 0;
@@ -602,34 +634,22 @@ function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
 
 	// Translate it now
-	switch (GET_LANGUAGE()) {
-	case "de":
-		$dotted = number_format($dotted, $maxComma, ",", ".");
-		break;
-
-	default:
-		$dotted = number_format($dotted, $maxComma, ".", ",");
-		break;
+	switch (getLanguage()) {
+		case 'de':
+			$dotted = number_format($dotted, $maxComma, ',', '.');
+			break;
+
+		default:
+			$dotted = number_format($dotted, $maxComma, '.', ',');
+			break;
 	}
 
 	// Return translated value
 	return $dotted;
 }
 
-//
-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));
-	} // END - if
-
-	// Return link
-	return $URL;
-}
-
 // Translate Uni*-like gender to human-readable
-function TRANSLATE_GENDER ($gender) {
+function translateGender ($gender) {
 	// Default
 	$ret = '!' . $gender . '!';
 
@@ -648,17 +668,54 @@ function TRANSLATE_GENDER ($gender) {
 	return $ret;
 }
 
-//
+// "Translates" the user status
+function translateUserStatus ($status) {
+	switch ($status)
+	{
+		case 'UNCONFIRMED':
+		case 'CONFIRMED':
+		case 'LOCKED':
+			$ret = getMessage(sprintf("ACCOUNT_%s", $status));
+			break;
+
+		case '':
+		case null:
+			$ret = getMessage('ACCOUNT_DELETED');
+			break;
+
+		default:
+			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
+			$ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
+			break;
+	}
+
+	// Return it
+	return $ret;
+}
+
+// Generates an URL for the dereferer
+function DEREFERER ($URL) {
+	// Don't de-refer our own links!
+	if (substr($URL, 0, strlen(constant('URL'))) != constant('URL')) {
+		// De-refer this link
+		$URL = 'modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
+	} // END - if
+
+	// Return link
+	return $URL;
+}
+
+// Generates an URL for the frametester
 function FRAMETESTER ($URL) {
 	// Prepare frametester URL
 	$frametesterUrl = sprintf("{!URL!}/modules.php?module=frametester&amp;url=%s",
-		encodeString(compileUriCode($URL))
+	encodeString(compileUriCode($URL))
 	);
 	return $frametesterUrl;
 }
 
-//
-function SELECTION_COUNT ($array) {
+// Count entries from e.g. a selection box
+function countSelection ($array) {
 	$ret = 0;
 	if (is_array($array)) {
 		foreach ($array as $key => $selected) {
@@ -668,80 +725,13 @@ function SELECTION_COUNT ($array) {
 	return $ret;
 }
 
-//
-function IMG_CODE ($code, $type, $DATA, $uid) {
+// Generate XHTML code for the CAPTCHA
+function generateCaptchaCode ($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 . '" />';
 }
 
-//
-function TRANSLATE_STATUS ($status) {
-	switch ($status)
-	{
-	case 'UNCONFIRMED':
-	case 'CONFIRMED':
-	case 'LOCKED':
-		$ret = getMessage(sprintf("ACCOUNT_%s", $status));
-		break;
-
-	case '':
-	case null:
-		$ret = getMessage('ACCOUNT_DELETED');
-		break;
-
-	default:
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
-		$ret = sprintf(getMessage('UNKNOWN_STATUS'), $status);
-		break;
-	}
-
-	// Return it
-	return $ret;
-}
-//
-function GET_LANGUAGE() {
-	// Set default return value to default language from config
-	$ret = constant('DEFAULT_LANG');
-
-	// Init variable
-	$lang = '';
-
-	// Is the variable set
-	if (REQUEST_ISSET_GET(('mx_lang'))) {
-		// Accept only first 2 chars
-		$lang = substr(REQUEST_GET('mx_lang'), 0, 2);
-	} elseif (isset($GLOBALS['cache_array']['language'])) {
-		// Use cached
-		$ret = $GLOBALS['cache_array']['language'];
-	} elseif (!empty($lang)) {
-		// Check if main language file does exist
-		if (FILE_READABLE(constant('PATH').'inc/language/'.$lang.'.php')) {
-			// Okay found, so let's update cookies
-			SET_LANGUAGE($lang);
-		}
-	} elseif (!isSessionVariableSet('mx_lang')) {
-		// Return stored value from cookie
-		$ret = get_session('mx_lang');
-
-		// Fixes a warning before the session has the mx_lang constant
-		if (empty($ret)) $ret = constant('DEFAULT_LANG');
-	}
-
-	// Cache entry
-	$GLOBALS['cache_array']['language'] = $ret;
-
-	// Return value
-	return $ret;
-}
-//
-function SET_LANGUAGE ($lang) {
-	// Accept only first 2 chars!
-	$lang = substr(SQL_ESCAPE(strip_tags($lang)), 0, 2);
-
-	// Set cookie
-	set_session('mx_lang', $lang);
-}
-//
-function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
+// Loads an email template and compiles it
+function LOAD_EMAIL_TEMPLATE ($template, $content = array(), $UID = '0') {
 	global $DATA, $_CONFIG;
 
 	// Make sure all template names are lowercase!
@@ -751,8 +741,8 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 	$nick = '---';
 
 	// Prepare IP number and User Agent
-	$REMOTE_ADDR     = GET_REMOTE_ADDR();
-	$HTTP_USER_AGENT = GET_USER_AGENT();
+	$REMOTE_ADDR     = detectRemoteAddr();
+	$HTTP_USER_AGENT = detectUserAgent();
 
 	// Default admin
 	$ADMIN = constant('MAIN_TITLE');
@@ -760,22 +750,23 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 	// Is the admin logged in?
 	if (IS_ADMIN()) {
 		// Get admin id
-		$aid = GET_CURRENT_ADMIN_ID();
+		$aid = getCurrentAdminId();
 
 		// Load Admin data
-		$ADMIN = GET_ADMIN_EMAIL($aid);
+		$ADMIN = getAdminEmail($aid);
 	} // END - if
 
 	// Neutral email address is default
 	$email = constant('WEBMASTER');
 
 	// Expiration in a nice output format
+	// NOTE: Use $content[expiration] in your templates instead of $EXPIRATION
 	if (getConfig('auto_purge') == 0) {
 		// Will never expire!
 		$EXPIRATION = getMessage('MAIL_WILL_NEVER_EXPIRE');
 	} else {
 		// Create nice date string
-		$EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge'));
+		$EXPIRATION = createFancyTime(getConfig('auto_purge'));
 	}
 
 	// Is content an array?
@@ -792,12 +783,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 			//* 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",
-				array(bigintval($UID)), __FUNCTION__, __LINE__);
+			array(bigintval($UID)), __FUNCTION__, __LINE__);
 		} else {
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />\n";
 			/// Load normal data
 			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-				array(bigintval($UID)), __FUNCTION__, __LINE__);
+			array(bigintval($UID)), __FUNCTION__, __LINE__);
 		}
 
 		// Fetch and merge data
@@ -810,7 +801,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 	} // END - if
 
 	// Translate M to male or F to female if present
-	if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']);
+	if (isset($content['gender'])) $content['gender'] = translateGender($content['gender']);
 
 	// Overwrite email from data if present
 	if (isset($content['email'])) $email = $content['email'];
@@ -819,41 +810,41 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 	$DATA['email'] = $email;
 
 	// Base directory
-	$basePath = sprintf("%stemplates/%s/emails/", constant('PATH'), GET_LANGUAGE());
+	$basePath = sprintf("%stemplates/%s/emails/", constant('PATH'), getLanguage());
 
 	// Check for admin/guest/member templates
-	if (strpos($template, "admin_") > -1) {
+	if (strpos($template, 'admin_') > -1) {
 		// Admin template found
-		$FQFN = $basePath."admin/".$template.".tpl";
-	} elseif (strpos($template, "guest_") > -1) {
+		$FQFN = $basePath.'admin/'.$template.'.tpl';
+	} elseif (strpos($template, 'guest_') > -1) {
 		// Guest template found
-		$FQFN = $basePath."guest/".$template.".tpl";
-	} elseif (strpos($template, "member_") > -1) {
+		$FQFN = $basePath.'guest/'.$template.'.tpl';
+	} elseif (strpos($template, 'member_') > -1) {
 		// Member template found
-		$FQFN = $basePath."member/".$template.".tpl";
+		$FQFN = $basePath.'member/'.$template.'.tpl';
 	} else {
 		// Test for extension
-		$test = substr($template, 0, strpos($template, "_"));
+		$test = substr($template, 0, strpos($template, '_'));
 		if (EXT_IS_ACTIVE($test)) {
 			// Set extra path to extension's name
-			$FQFN = $basePath.$test."/".$template.".tpl";
+			$FQFN = $basePath.$test.'/'.$template.'.tpl';
 		} else {
 			// No special filename
-			$FQFN = $basePath.$template.".tpl";
+			$FQFN = $basePath.$template.'.tpl';
 		}
 	}
 
 	// Does the special template exists?
-	if (!FILE_READABLE($FQFN)) {
+	if (!isFileReadable($FQFN)) {
 		// Reset to default template
-		$FQFN = $basePath.$template.".tpl";
+		$FQFN = $basePath.$template.'.tpl';
 	} // END - if
 
 	// Now does the final template exists?
 	$newContent = '';
-	if (FILE_READABLE($FQFN)) {
+	if (isFileReadable($FQFN)) {
 		// The local file does exists so we load it. :)
-		$tmpl_file = READ_FILE($FQFN);
+		$tmpl_file = readFromFile($FQFN);
 		$tmpl_file = SQL_ESCAPE($tmpl_file);
 
 		// Run code
@@ -890,25 +881,27 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID='0') {
 	// Return compiled content
 	return COMPILE_CODE($newContent);
 }
-//
-function MAKE_TIME ($H, $M, $S, $stamp) {
+
+// Generates a timestamp (some wrapper for mktime())
+function makeTime ($H, $M, $S, $stamp) {
 	// Extract day, month and year from given timestamp
-	$DAY   = date("d", $stamp);
-	$MONTH = date("m", $stamp);
-	$YEAR  = date('Y', $stamp);
+	$day   = date('d', $stamp);
+	$month = date('m', $stamp);
+	$year  = date('Y', $stamp);
 
 	// Create timestamp for wished time which depends on extracted date
-	return mktime($H, $M, $S, $MONTH, $DAY, $YEAR);
+	return mktime($H, $M, $S, $month, $day, $year);
 }
-//
-function LOAD_URL ($URL, $addUrlData=true) {
+
+// Redirects to an URL and if neccessarry extends it with own base URL
+function redirectToUrl ($URL) {
 	// Compile out URI codes
 	$URL = compileUriCode($URL);
 
 	// Check if http(s):// is there
-	if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
+	if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) {
 		// Make all URLs full-qualified
-		$URL = "".$URL;
+		$URL = constant('URL') . '/' . $URL;
 	} // END - if
 
 	// Three different debug ways...
@@ -916,6 +909,15 @@ function LOAD_URL ($URL, $addUrlData=true) {
 	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, $URL);
 	//* DEBUG: */ die($URL);
 
+	// Default 'rel' value is external, nofollow is evil from Google and hurts the Internet
+	$rel = ' rel="external"';
+
+	// Do we have internal or external URL?
+	if (substr($URL, 0, strlen(constant('URL'))) == constant('URL')) {
+		// Own (=internal) URL
+		$rel = '';
+	} // END - if
+
 	// Get output buffer
 	$OUTPUT = ob_get_contents();
 
@@ -924,33 +926,30 @@ function LOAD_URL ($URL, $addUrlData=true) {
 		clearOutputBuffer();
 	} // END - if
 
-	// Add some data to URL if cookies are not accepted
-	if (((!defined('__COOKIES')) || (!constant('__COOKIES'))) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
-
-	// Probe for bot from search engine
-	if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT()))) {
-		// Search engine bot detected so let's rewrite many chars for the link
-		$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
+	// Secure the URL against bad things such als HTML insertions and so on...
+	$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
 
+	// Simple probe for bots/spiders from search engines
+	if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
 		// Output new location link as anchor
-		OUTPUT_HTML("<a href=\"".$URL."\">".$URL."</a>");
+		OUTPUT_HTML('<a href="' . $URL . '"' . $rel . '>' . $URL . '</a>');
 	} elseif (!headers_sent()) {
 		// Load URL when headers are not sent
 		//* DEBUG: */ debug_report_bug("URL={$URL}");
-		header ("Location: ".str_replace("&amp;", "&", $URL));
+		sendHeader('Location: '.str_replace('&amp;', '&', $URL));
 	} else {
 		// Output error message
-		LOAD_INC('inc/header.php');
-		LOAD_TEMPLATE("redirect_url", false, str_replace("&amp;", "&", $URL));
-		LOAD_INC('inc/footer.php');
+		loadInclude('inc/header.php');
+		LOAD_TEMPLATE('redirect_url', false, str_replace('&amp;', '&', $URL));
+		loadInclude('inc/footer.php');
 	}
 
 	// Shut the mailer down here
 	shutdown();
 }
 
-// Wrapper for LOAD_URL but URL comes from a configuration entry
-function LOAD_CONFIGURED_URL ($configEntry) {
+// Wrapper for redirectToUrl but URL comes from a configuration entry
+function redirectToConfiguredUrl ($configEntry) {
 	// Get the URL
 	$URL = getConfig($configEntry);
 
@@ -961,7 +960,7 @@ function LOAD_CONFIGURED_URL ($configEntry) {
 	} // END - if
 
 	// Load the URL
-	LOAD_URL($URL);
+	redirectToUrl($URL);
 }
 
 //
@@ -1047,7 +1046,7 @@ function COMPILE_CODE ($code, $simple = false, $constants = true, $full = true)
 	// Return compiled code
 	return $code;
 }
-//
+
 /************************************************************************
  *                                                                      *
  * Gaenderter Sortier-Algorythmus, $array wird nach dem Array (!)       *
@@ -1100,7 +1099,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 }
 
 //
-function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
+function ADD_SELECTION ($type, $default, $prefix = '', $id = '0') {
 	$OUT = '';
 
 	if ($type == 'yn') {
@@ -1116,164 +1115,147 @@ function ADD_SELECTION ($type, $DEFAULT, $prefix="", $id="0") {
 	}
 
 	switch ($type) {
-	case "day": // Day
-		for ($idx = 1; $idx < 32; $idx++) {
-			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
-			$OUT .= ">".$idx."</option>\n";
-		} // END - for
-		break;
+		case "day": // Day
+			for ($idx = 1; $idx < 32; $idx++) {
+				$OUT .= "<option value=\"".$idx."\"";
+				if ($default == $idx) $OUT .= ' selected="selected"';
+				$OUT .= ">".$idx."</option>\n";
+			} // END - for
+			break;
 
-	case "month": // Month
-		foreach ($GLOBALS['month_descr'] as $month => $descr) {
-			$OUT .= "<option value=\"".$month."\"";
-			if ($DEFAULT == $month) $OUT .= ' selected="selected"';
-			$OUT .= ">".$descr."</option>\n";
-		} // END - for
-		break;
+		case "month": // Month
+			foreach ($GLOBALS['month_descr'] as $month => $descr) {
+				$OUT .= "<option value=\"".$month."\"";
+				if ($default == $month) $OUT .= ' selected="selected"';
+				$OUT .= ">".$descr."</option>\n";
+			} // END - for
+			break;
 
-	case "year": // Year
-		// Get current year
-		$YEAR = date('Y', time());
+		case "year": // Year
+			// Get current year
+			$year = date('Y', time());
 
-		// Use configured min age or fixed?
-		if (GET_EXT_VERSION('other') >= '0.2.1') {
-			// Configured
-			$startYear = $YEAR - getConfig('min_age');
-		} else {
-			// Fixed 16 years
-			$startYear = $YEAR - 16;
-		}
+			// Use configured min age or fixed?
+			if (GET_EXT_VERSION('other') >= '0.2.1') {
+				// Configured
+				$startYear = $year - getConfig('min_age');
+			} else {
+				// Fixed 16 years
+				$startYear = $year - 16;
+			}
 
-		// Calculate earliest year (100 years old people can still enter Internet???)
-		$minYear = $YEAR - 100;
+			// Calculate earliest year (100 years old people can still enter Internet???)
+			$minYear = $year - 100;
+
+			// Check if the default value is larger than minimum and bigger than actual year
+			if (($default > $minYear) && ($default >= $year)) {
+				for ($idx = $year; $idx < ($year + 11); $idx++) {
+					$OUT .= "<option value=\"".$idx."\"";
+					if ($default == $idx) $OUT .= ' selected="selected"';
+					$OUT .= ">".$idx."</option>\n";
+				} // END - for
+			} elseif ($default == -1) {
+				// Current year minus 1
+				for ($idx = $startYear; $idx <= ($year + 1); $idx++)
+				{
+					$OUT .= "<option value=\"".$idx."\">".$idx."</option>\n";
+				}
+			} else {
+				// 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') {
+					// Use configured minimum age
+					$year = date('Y', time()) - getConfig('min_age');
+				} else {
+					// Use fixed 16 years age
+					$year = date('Y', time()) - 16;
+				}
 
-		// Check if the default value is larger than minimum and bigger than actual year
-		if (($DEFAULT > $minYear) && ($DEFAULT >= $YEAR)) {
-			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++) {
+				// Construct year selection list
+				for ($idx = $minYear; $idx <= $year; $idx++) {
+					$OUT .= "<option value=\"".$idx."\"";
+					if ($default == $idx) $OUT .= ' selected="selected"';
+					$OUT .= ">".$idx."</option>\n";
+				} // END - for
+			}
+			break;
+
+		case "sec":
+		case "min":
+			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
-		} elseif ($DEFAULT == -1) {
-			// Current year minus 1
-			for ($idx = $startYear; $idx <= ($YEAR + 1); $idx++)
-			{
-				$OUT .= "<option value=\"".$idx."\">".$idx."</option>\n";
-			}
-		} else {
-			// 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') {
-				// Use configured minimum age
-				$YEAR = date('Y', time()) - getConfig('min_age');
-			} else {
-				// Use fixed 16 years age
-				$YEAR = date('Y', time()) - 16;
-			}
+			break;
 
-			// Construct year selection list
-			for ($idx = $minYear; $idx <= $YEAR; $idx++) {
+		case "hour":
+			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 "sec":
-	case "min":
-		for ($idx = 0; $idx < 60; $idx+=5) {
-			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
-			$OUT .= ">".$idx."</option>\n";
-		} // END - for
-		break;
-
-	case "hour":
-		for ($idx = 0; $idx < 24; $idx++) {
-			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "<option value=\"".$idx."\"";
-			if ($DEFAULT == $idx) $OUT .= ' selected="selected"';
-			$OUT .= ">".$idx."</option>\n";
-		} // END - for
-		break;
-
-	case 'yn':
-		$OUT .= "<option value=\"Y\"";
-		if ($DEFAULT == 'Y') $OUT .= ' selected="selected"';
-		$OUT .= ">{--YES--}</option>\n<option value=\"N\"";
-		if ($DEFAULT == 'N') $OUT .= ' selected="selected"';
-		$OUT .= ">{--NO--}</option>\n";
-		break;
-	}
-	$OUT .= "    </select>\n";
-	return $OUT;
-}
+			break;
 
-//
-function TRANSLATE_YESNO ($yn) {
-	// Default
-	$translated = "??? (".$yn.")";
-	switch ($yn) {
-		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));
+		case 'yn':
+			$OUT .= "<option value=\"Y\"";
+			if ($default == 'Y') $OUT .= ' selected="selected"';
+			$OUT .= ">{--YES--}</option>\n<option value=\"N\"";
+			if ($default == 'N') $OUT .= ' selected="selected"';
+			$OUT .= ">{--NO--}</option>\n";
 			break;
 	}
-
-	// Return it
-	return $translated;
+	$OUT .= "    </select>\n";
+	return $OUT;
 }
 
 //
 // Deprecated : $length
 // Optional   : $DATA
 //
-function generateRandomCodde ($length, $code, $uid, $DATA="") {
+function generateRandomCodde ($length, $code, $uid, $DATA = '') {
 	// Fix missing _MAX constant
 	// @TODO Rewrite this unnice code
 	if (!defined('_MAX')) define('_MAX', 15235);
 
 	// Build server string
-	$server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(constant('PATH')."inc/databases.php");
+	$server = $_SERVER['PHP_SELF'].getConfig('ENCRYPT_SEPERATOR').detectUserAgent().getConfig('ENCRYPT_SEPERATOR').getenv('SERVER_SOFTWARE').getConfig('ENCRYPT_SEPERATOR').detectRemoteAddr().":'.':".filemtime(constant('PATH').'inc/databases.php');
 
 	// Build key string
-	$keys   = constant('SITE_KEY').":".constant('DATE_KEY');
-	if (isConfigEntrySet('secret_key'))  $keys .= ":".getConfig('secret_key');
-	if (isConfigEntrySet('file_hash'))   $keys .= ":".getConfig('file_hash');
-	$keys .= ":".date("d-m-Y (l-F-T)", getConfig(('patch_ctime')));
-	if (isConfigEntrySet('master_salt')) $keys .= ":".getConfig('master_salt');
+	$keys = getConfig('SITE_KEY').getConfig('ENCRYPT_SEPERATOR').getConfig('DATE_KEY');
+	if (isConfigEntrySet('secret_key'))  $keys .= getConfig('ENCRYPT_SEPERATOR').getConfig('secret_key');
+	if (isConfigEntrySet('file_hash'))   $keys .= getConfig('ENCRYPT_SEPERATOR').getConfig('file_hash');
+	$keys .= getConfig('ENCRYPT_SEPERATOR').date("d-m-Y (l-F-T)", getConfig(('patch_ctime')));
+	if (isConfigEntrySet('master_salt')) $keys .= getConfig('ENCRYPT_SEPERATOR').getConfig('master_salt');
 
 	// Build string from misc data
-	$data   = $code.":".$uid.":".$DATA;
+	$data   = $code.getConfig('ENCRYPT_SEPERATOR').$uid.getConfig('ENCRYPT_SEPERATOR').$DATA;
 
 	// Add more additional data
-	if (isSessionVariableSet('u_hash'))			$data .= ":".get_session('u_hash');
-	if (isUserIdSet())							$data .= ":".getUserId();
-	if (isSessionVariableSet('mxchange_theme'))		$data .= ":".get_session('mxchange_theme');
-	if (isSessionVariableSet('mx_lang'))			$data .= ":".GET_LANGUAGE();
-	if (isset($GLOBALS['refid']))					$data .= ":".$GLOBALS['refid'];
+	if (isSessionVariableSet('u_hash'))         $data .= getConfig('ENCRYPT_SEPERATOR').getSession('u_hash');
+	if (isUserIdSet())                          $data .= getConfig('ENCRYPT_SEPERATOR').getUserId();
+	if (isSessionVariableSet('mxchange_theme')) $data .= getConfig('ENCRYPT_SEPERATOR').getSession('mxchange_theme');
+	if (isSessionVariableSet('mx_lang'))        $data .= getConfig('ENCRYPT_SEPERATOR').getLanguage();
+	if (isset($GLOBALS['refid']))               $data .= getConfig('ENCRYPT_SEPERATOR').$GLOBALS['refid'];
 
 	// Calculate number for generating the code
-	$a = $code + constant('_ADD') - 1;
+	$a = $code + getConfig('_ADD') - 1;
 
 	if (isConfigEntrySet('master_hash')) {
 		// Generate hash with master salt from modula of number with the prime number and other data
-		$saltedHash = generateHash(($a % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, getConfig('master_salt'));
+		$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'));
 
 		// Create number from hash
-		$rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(constant('_MAX') - $a + sqrt(constant('_ADD'))) / pi();
+		$rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(constant('_MAX') - $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 % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, substr(sha1(constant('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, 8));
 
 		// Create number from hash
-		$rcode = hexdec(substr($saltedHash, 8, 9)) / abs(constant('_MAX') - $a + sqrt(constant('_ADD'))) / pi();
+		$rcode = hexdec(substr($saltedHash, 8, 9)) / abs(constant('_MAX') - $a + sqrt(getConfig('_ADD'))) / pi();
 	}
 
 	// At least 10 numbers shall be secure enought!
@@ -1298,7 +1280,7 @@ function bigintval ($num, $castValue = true) {
 
 	// Has the whole value changed?
 	// @TODO Remove this if() block if all is working fine
-	if ("".$ret."" != "".$num."") {
+	if ("".$ret."" != ''.$num."") {
 		// Log the values
 		debug_report_bug("{$ret}<>{$num}");
 	} // END - if
@@ -1318,20 +1300,20 @@ function GENERATE_IMAGE ($img_code, $headerSent=true) {
 	}
 
 	// Load image
-	$img = sprintf("%s/theme/%s/images/code_bg.%s", constant('PATH'), GET_CURR_THEME(), getConfig('img_type'));
-	if (FILE_READABLE($img)) {
+	$img = sprintf("%s/theme/%s/images/code_bg.%s", constant('PATH'), getCurrentTheme(), getConfig('img_type'));
+	if (isFileReadable($img)) {
 		// Switch image type
 		switch (getConfig('img_type'))
 		{
-		case "jpg":
-			// Okay, load image and hide all errors
-			$image = @imagecreatefromjpeg($img);
-			break;
+			case 'jpg':
+				// Okay, load image and hide all errors
+				$image = @imagecreatefromjpeg($img);
+				break;
 
-		case "png":
-			// Okay, load image and hide all errors
-			$image = @imagecreatefrompng($img);
-			break;
+			case 'png':
+				// Okay, load image and hide all errors
+				$image = @imagecreatefrompng($img);
+				break;
 		}
 	} else {
 		// Exit function here
@@ -1346,28 +1328,28 @@ function GENERATE_IMAGE ($img_code, $headerSent=true) {
 	imagestring($image, 5, 14, 2, $img_code, $text_color);
 
 	// Return to browser
-	header ("Content-Type: image/".getConfig('img_type'));
+	sendHeader('Content-Type: image/' . getConfig('img_type'));
 
 	// Output image with matching image factory
 	switch (getConfig('img_type')) {
-		case "jpg": imagejpeg($image); break;
-		case "png": imagepng($image);  break;
+		case 'jpg': imagejpeg($image); break;
+		case 'png': imagepng($image);  break;
 	}
 
 	// Remove image from memory
 	imagedestroy($image);
 }
 // Create selection box or array of splitted timestamp
-function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
+function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'center', $return_array=false) {
 	// Calculate 2-seconds timestamp
 	$stamp = round($timestamp);
-	//* DEBUG: */ print("*".$stamp."/".$timestamp."*<br />");
+	//* DEBUG: */ print("*".$stamp.'/'.$timestamp."*<br />");
 
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
-	$M1 = date("m", time());
-	$M2 = date("m", (time() + $timestamp));
+	$M1 = date('m', time());
+	$M2 = date('m', (time() + $timestamp));
 
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
 	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($M2 > "02"))  $SWITCH = getConfig('one_day');
@@ -1440,7 +1422,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
 		}
 
-		if (ereg("m", $display) || (empty($display))) {
+		if (ereg('m', $display) || (empty($display))) {
 			$OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
 		}
 
@@ -1469,7 +1451,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 11; $idx++)
 			{
-					$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
+				$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $M) $OUT .= ' selected="selected"';
 				$OUT .= ">".$idx."</option>\n";
 			}
@@ -1517,7 +1499,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ho\" value=\"0\">\n";
 		}
 
-		if (ereg("m", $display) || (empty($display))) {
+		if (ereg('m', $display) || (empty($display))) {
 			// Generate minute selection
 			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 59; $idx++) {
@@ -1551,14 +1533,14 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 }
 
 //
-function CREATE_TIMESTAMP_FROM_SELECTIONS ($prefix, $POST) {
+function createTimestampFromSelections ($prefix, $POST) {
 	// Initial return value
 	$ret = 0;
 
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
-	$M1   = date("m", time());
+	$M1   = date('m', time());
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
 	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($POST[$prefix."_mo"] > "02"))  $SWITCH = getConfig('one_day');
 	// First add years...
@@ -1590,11 +1572,11 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
 
 	// Check which admin shall receive this mail
 	$result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
-		array($template), __FUNCTION__, __LINE__);
+	array($template), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Create new entry (to all admins)
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",
-			array($template), __FUNCTION__, __LINE__);
+		array($template), __FUNCTION__, __LINE__);
 	} else {
 		// Load admin IDs...
 		// @TODO This can be, somehow, rewritten
@@ -1610,43 +1592,43 @@ function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
 		$result = false;
 
 		// "implode" IDs and query string
-		$aid = implode(",", $adminIds);
-		if ($aid == "-1") {
+		$aid = implode(',', $adminIds);
+		if ($aid == '-1') {
 			if (EXT_IS_ACTIVE('events')) {
 				// Add line to user events
 				EVENTS_ADD_LINE($subj, $msg, $UID);
 			} else {
 				// Log error for debug
 				DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
-					$template,
-					$subj,
-					$UID
+				$template,
+				$subj,
+				$UID
 				));
 			}
-		} elseif ($aid == "0") {
+		} elseif ($aid == '0') {
 			// Select all email adresses
 			$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`",
-				__FUNCTION__, __LINE__);
+			__FUNCTION__, __LINE__);
 		} else {
 			// If Admin-ID is not "to-all" select
 			$result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`",
-				array($aid), __FUNCTION__, __LINE__);
+			array($aid), __FUNCTION__, __LINE__);
 		}
 	}
 
 	// Load email addresses and send away
 	while ($content = SQL_FETCHARRAY($result)) {
-		SEND_EMAIL($content['email'], $subj, $msg);
+		sendEmail($content['email'], $subj, $msg);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 }
 
-//
-function CREATE_FANCY_TIME ($stamp) {
+// Creates a 'fancy' human-readable timestamp from a Uni* stamp
+function createFancyTime ($stamp) {
 	// Get data array with years/months/weeks/days/...
-	$data = CREATE_TIME_SELECTIONS($stamp, '', '', '', true);
+	$data = createTimeSelections($stamp, '', '', '', true);
 	$ret = '';
 	foreach($data as $k => $v) {
 		if ($v > 0) {
@@ -1681,7 +1663,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
 	$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 {
@@ -1695,7 +1677,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
 			$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 {
@@ -1705,7 +1687,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
 
 		// Add seperator if we have not yet reached total pages
 		if ($page < $PAGES) $NAV .= "&nbsp;|&nbsp;";
-	}
+	} // END - for
 
 	// Define constants only once
 	if (!defined('__NAV_OUTPUT')) {
@@ -1713,7 +1695,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
 		define('__NAV_COLSPAN', $colspan);
 		define('__NAV_TOP'    , $TOP);
 		define('__NAV_SEP'    , $SEP);
-	}
+	} // END - if
 
 	// Load navigation template
 	$OUT = LOAD_TEMPLATE("admin_email_nav_row", true);
@@ -1728,7 +1710,7 @@ function ADD_EMAIL_NAV ($PAGES, $offset, $show_form, $colspan, $return=false) {
 }
 
 // Extract host from script name
-function EXTRACT_HOST (&$script) {
+function extractHostnameFromUrl (&$script) {
 	// Use default SERVER_URL by default... ;) So?
 	$url = constant('SERVER_URL');
 
@@ -1736,14 +1718,14 @@ function EXTRACT_HOST (&$script) {
 	if (substr($script, 0, 7) == "http://") {
 		// Use the hostname from script URL as new hostname
 		$url = substr($script, 7);
-		$extract = explode("/", $url);
+		$extract = explode('/', $url);
 		$url = $extract[0];
 		// Done extracting the URL :)
 	} // END - if
 
 	// Extract host name
 	$host = str_replace("http://", '', $url);
-	if (ereg("/", $host)) $host = substr($host, 0, strpos($host, "/"));
+	if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
 
 	// Generate relative URL
 	//* DEBUG: */ print("SCRIPT=".$script."<br />\n");
@@ -1756,86 +1738,89 @@ function EXTRACT_HOST (&$script) {
 	}
 
 	//* DEBUG: */ print("SCRIPT=".$script."<br />\n");
-	if (substr($script, 0, 1) == "/") $script = substr($script, 1);
+	if (substr($script, 0, 1) == '/') $script = substr($script, 1);
 
 	// Return host name
 	return $host;
 }
 
 // Send a GET request
-function GET_URL ($script) {
+function sendGetRequest ($script) {
 	// Compile the script name
 	$script = COMPILE_CODE($script);
 
 	// Extract host name from script
-	$host = EXTRACT_HOST($script);
+	$host = extractHostnameFromUrl($script);
 
 	// Generate GET request header
-	$request  = "GET /" . trim($script) . " HTTP/1.1\r\n";
-	$request .= "Host: " . $host . "\r\n";
-	$request .= "Referer: " . constant('URL') . "/admin.php\r\n";
+	$request  = "GET /" . trim($script) . " HTTP/1.1" . getConfig('HTTP_EOL');
+	$request .= "Host: " . $host . getConfig('HTTP_EOL');
+	$request .= "Referer: " . constant('URL') . "/admin.php" . getConfig('HTTP_EOL');
 	if (defined('FULL_VERSION')) {
-		$request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n";
+		$request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . getConfig('HTTP_EOL');
 	} else {
-		$request .= "User-Agent: " . constant('TITLE') . "/?.?.?\r\n";
+		$request .= "User-Agent: " . constant('TITLE') . "/?.?.?" . getConfig('HTTP_EOL');
 	}
-	$request .= "Content-Type: text/plain\r\n";
-	$request .= "Cache-Control: no-cache\r\n";
-	$request .= "Connection: Close\r\n\r\n";
+	$request .= "Content-Type: text/plain" . getConfig('HTTP_EOL');
+	$request .= "Cache-Control: no-cache" . getConfig('HTTP_EOL');
+	$request .= "Connection: Close" . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
 
 	// Send the raw request
-	$response = SEND_RAW_REQUEST($host, $request);
+	$response = sendRawRequest($host, $request);
 
 	// Return the result to the caller function
 	return $response;
 }
 
 // Send a POST request
-function POST_URL ($script, $postData) {
+function sendPostRequest ($script, $postData) {
 	// Is postData an array?
 	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
 	$script = COMPILE_CODE($script);
 
 	// Extract host name from script
-	$host = EXTRACT_HOST($script);
+	$host = extractHostnameFromUrl($script);
 
 	// Construct request
 	$data = http_build_query($postData, '','&');
 
 	// Generate POST request header
-	$request  = "POST /" . trim($script) . " HTTP/1.1\r\n";
-	$request .= "Host: " . $host . "\r\n";
-	$request .= "Referer: " . constant('URL') . "/admin.php\r\n";
-	$request .= "User-Agent: " . constant('TITLE') . "/" . constant('FULL_VERSION') . "\r\n";
-	$request .= "Content-type: application/x-www-form-urlencoded\r\n";
-	$request .= "Content-length: " . strlen($data) . "\r\n";
-	$request .= "Cache-Control: no-cache\r\n";
-	$request .= "Connection: Close\r\n\r\n";
+	$request  = "POST /" . trim($script) . " HTTP/1.1" . getConfig('HTTP_EOL');
+	$request .= "Host: " . $host . getConfig('HTTP_EOL');
+	$request .= "Referer: " . constant('URL') . "/admin.php" . getConfig('HTTP_EOL');
+	$request .= "User-Agent: " . constant('TITLE') . '/' . constant('FULL_VERSION') . getConfig('HTTP_EOL');
+	$request .= "Content-type: application/x-www-form-urlencoded" . getConfig('HTTP_EOL');
+	$request .= "Content-length: " . strlen($data) . getConfig('HTTP_EOL');
+	$request .= "Cache-Control: no-cache" . getConfig('HTTP_EOL');
+	$request .= "Connection: Close" . getConfig('HTTP_EOL') . getConfig('HTTP_EOL');
 	$request .= $data;
 
 	// Send the raw request
-	$response = SEND_RAW_REQUEST($host, $request);
+	$response = sendRawRequest($host, $request);
 
 	// Return the result to the caller function
 	return $response;
 }
 
 // Sends a raw request to another host
-function SEND_RAW_REQUEST ($host, $request) {
+function sendRawRequest ($host, $request) {
+	// Init errno and errdesc with 'all fine' values
+	$errno = 0; $errdesc = '';
+
 	// Initialize array
-	$response = array("", '', '');
+	$response = array('', '', '');
 
 	// Default is not to use proxy
 	$useProxy = false;
 
 	// Are proxy settins set?
-	if ((getConfig('proxy_host') != "") && (getConfig('proxy_port') > 0)) {
+	if ((getConfig('proxy_host') != '') && (getConfig('proxy_port') > 0)) {
 		// Then use it
 		$useProxy = true;
 	} // END - if
@@ -1857,18 +1842,18 @@ function SEND_RAW_REQUEST ($host, $request) {
 	// Do we use proxy?
 	if ($useProxy) {
 		// Generate CONNECT request header
-		$proxyTunnel  = "CONNECT ".$host.":80 HTTP/1.1\r\n";
-		$proxyTunnel .= "Host: ".$host."\r\n";
+		$proxyTunnel  = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL');
+		$proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL');
 
 		// Use login data to proxy? (username at least!)
-		if (getConfig('proxy_username') != "") {
+		if (getConfig('proxy_username') != '') {
 			// Add it as well
-			$encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')).":".COMPILE_CODE(getConfig('proxy_password')));
-			$proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
+			$encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')).getConfig('ENCRYPT_SEPERATOR').COMPILE_CODE(getConfig('proxy_password')));
+			$proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
 		} // END - if
 
 		// Add last new-line
-		$proxyTunnel .= "\r\n";
+		$proxyTunnel .= getConfig('HTTP_EOL');
 		//* DEBUG: */ print("<strong>proxyTunnel=</strong><pre>".$proxyTunnel."</pre>");
 
 		// Write request
@@ -1882,8 +1867,8 @@ function SEND_RAW_REQUEST ($host, $request) {
 
 		// Read the first line
 		$resp = trim(fgets($fp, 10240));
-		$respArray = explode(" ", $resp);
-		if ((strtolower($respArray[0]) !== "http/1.0") || ($respArray[1] != "200")) {
+		$respArray = explode(' ', $resp);
+		if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
 			// Invalid response!
 			return $response;
 		} // END - if
@@ -1919,16 +1904,16 @@ function SEND_RAW_REQUEST ($host, $request) {
 	//* DEBUG: */ print("<strong>Response:</strong><pre>".print_r($response, true)."</pre>");
 
 	// Proxy agent found?
-	if ((substr(strtolower($response[0]), 0, 11) == "proxy-agent") && ($useProxy)) {
+	if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy)) {
 		// Proxy header detected, so remove two lines
 		array_shift($response);
 		array_shift($response);
 	} // END - if
 
 	// Was the request successfull?
-	if ((!eregi("200 OK", $response[0])) || (empty($response[0]))) {
+	if ((!eregi('200 OK', $response[0])) || (empty($response[0]))) {
 		// Not found / access forbidden
-		$response = array("", '', '');
+		$response = array('', '', '');
 	} // END - if
 
 	// Return response
@@ -1936,25 +1921,26 @@ function SEND_RAW_REQUEST ($host, $request) {
 }
 
 // Taken from www.php.net eregi() user comments
-function VALIDATE_EMAIL ($email) {
+function isEmailValid ($email) {
 	// Compile email
 	$email = COMPILE_CODE($email);
 
 	// Check first part of email address
-	$first = "[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*";
+	$first = '[-a-z0-9!#$%&\'*+/=?^_<{|}~]+(\.[-a-zA-Z0-9!#$%&\'*+/=?^_<{|}~]+)*';
 
 	//  Check domain
-	$domain = "[a-z0-9-]+(\.[a-z0-9-]{2,5})+";
+	$domain = '[a-z0-9-]+(\.[a-z0-9-]{2,5})+';
 
 	// Generate pattern
-	$regex = "^".$first."@".$domain."$";
+	$regex = '@^' . $first . '\@' . $domain . '$@iU';
 
 	// Return check result
-	return eregi($regex, $email);
+	// @NOTE altered the regex-pattern and added modificator i (match both upper and lower case letters) and U (PCRE_UNGREEDY) to work with preg_match the same way as eregi
+	return preg_match($regex, $email);
 }
 
 // Function taken from user comments on www.php.net / function eregi()
-function VALIDATE_URL ($URL, $compile=true) {
+function isUrlValid ($URL, $compile=true) {
 	// Trim URL a little
 	$URL = trim(urldecode($URL));
 	//* DEBUG: */ echo $URL."<br />";
@@ -1964,28 +1950,28 @@ function VALIDATE_URL ($URL, $compile=true) {
 	//* DEBUG: */ echo $URL."<br />";
 
 	// Check for the extension filter
-	if (EXT_IS_ACTIVE("filter")) {
+	if (EXT_IS_ACTIVE('filter')) {
 		// Use the extension's filter set
-		return FILTER_VALIDATE_URL($URL, false);
-	}
+		return FILTER_isUrlValid($URL, false);
+	} // END - if
 
 	// If not installed, perform a simple test. Just make it sure there is always a http:// or
 	// https:// in front of the URLs
-	return isUrlValid($URL);
+	return isUrlValidSimple($URL);
 }
 
 // Generate a list of administrative links to a given userid
-function MEMBER_ACTION_LINKS ($uid, $status = "") {
+function generateMemberAdminActionLinks ($uid, $status = '') {
 	// Define all main targets
-	$TARGETS = array("del_user", "edit_user", "lock_user", "add_points", "sub_points");
+	$TARGETS = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
 
 	// Begin of navigation links
 	$eval = "\$OUT = \"[&nbsp;";
 
 	foreach ($TARGETS as $tar) {
 		$eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"{!URL!}/modules.php?module=admin&amp;what=".$tar."&amp;uid=".$uid."\\\" title=\\\"{--ADMIN_LINK_";
-		//* DEBUG: */ echo "*".$tar."/".$status."*<br />\n";
-		if (($tar == "lock_user") && ($status == "LOCKED")) {
+		//* DEBUG: */ echo "*".$tar.'/'.$status."*<br />\n";
+		if (($tar == "lock_user") && ($status == 'LOCKED')) {
 			// Locked accounts shall be unlocked
 			$eval .= "UNLOCK_USER";
 		} else {
@@ -1993,7 +1979,7 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
 			$eval .= strtoupper($tar);
 		}
 		$eval .= "_TITLE--}\\\">{--ADMIN_";
-		if (($tar == "lock_user") && ($status == "LOCKED")) {
+		if (($tar == "lock_user") && ($status == 'LOCKED')) {
 			// Locked accounts shall be unlocked
 			$eval .= "UNLOCK_USER";
 		} else {
@@ -2012,31 +1998,31 @@ function MEMBER_ACTION_LINKS ($uid, $status = "") {
 }
 
 // Generate an email link
-function CREATE_EMAIL_LINK ($email, $table = 'admins') {
+function generateMemberEmailLink ($email, $table = 'admins') {
 	// Default email link (INSECURE! Spammer can read this by harvester programs)
-	$EMAIL = "mailto:".$email;
+	$EMAIL = 'mailto:' . $email;
 
 	// Check for several extensions
 	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")) {
+		$EMAIL = adminsCreateEmailLink($email);
+	} 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")) {
+		$EMAIL = USER_generateMemberEmailLink($email);
+	} 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);
+		$EMAIL = SPONSOR_generateMemberEmailLink($email);
 	}
 
 	// Shall I close the link when there is no admin?
-	if ((!IS_ADMIN()) && ($EMAIL == $email)) $EMAIL = "#"; // Closed!
+	if ((!IS_ADMIN()) && ($EMAIL == $email)) $EMAIL = '#'; // Closed!
 
 	// Return email link
 	return $EMAIL;
 }
 
 // Generate a hash for extra-security for all passwords
-function generateHash ($plainText, $salt = "") {
+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))) {
 		// Extension sql_patches is missing/outdated so we hash the plain text with MD5
@@ -2046,25 +2032,25 @@ function generateHash ($plainText, $salt = "") {
 	// Do we miss an arry element here?
 	if (!isConfigEntrySet('file_hash')) {
 		// Stop here
-		debug_report_bug("Missing file_hash in ".__FUNCTION__.".");
+		debug_report_bug('Missing file_hash in ' . __FUNCTION__ . '.');
 	} // END - if
 
 	// When the salt is empty build a new one, else use the first x configured characters as the salt
 	if (empty($salt)) {
-		// Build server string
-		$server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(constant('PATH')."inc/databases.php");
+		// Build server string (inc/databases.php is no longer updated with every commit)
+		$server = $_SERVER['PHP_SELF'].getConfig('ENCRYPT_SEPERATOR').detectUserAgent().getConfig('ENCRYPT_SEPERATOR').getenv('SERVER_SOFTWARE').getConfig('ENCRYPT_SEPERATOR').detectRemoteAddr();
 
 		// Build key string
-		$keys   = constant('SITE_KEY').":".constant('DATE_KEY').":".getConfig('secret_key').":".getConfig('file_hash').":".date("d-m-Y (l-F-T)", getConfig(('patch_ctime'))).":".getConfig('master_salt');
+		$keys   = getConfig('SITE_KEY').getConfig('ENCRYPT_SEPERATOR').getConfig('DATE_KEY').getConfig('ENCRYPT_SEPERATOR').getConfig('secret_key').getConfig('ENCRYPT_SEPERATOR').getConfig('file_hash').getConfig('ENCRYPT_SEPERATOR').date("d-m-Y (l-F-T)", getConfig(('patch_ctime'))).getConfig('ENCRYPT_SEPERATOR').getConfig('master_salt');
 
 		// Additional data
-		$data = $plainText.":".uniqid(mt_rand(), true).":".time();
+		$data = $plainText.getConfig('ENCRYPT_SEPERATOR').uniqid(mt_rand(), true).getConfig('ENCRYPT_SEPERATOR').time();
 
 		// Calculate number for generating the code
-		$a = time() + constant('_ADD') - 1;
+		$a = time() + getConfig('_ADD') - 1;
 
 		// Generate SHA1 sum from modula of number and the prime number
-		$sha1 = sha1(($a % constant('_PRIME')).$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a);
+		$sha1 = sha1(($a % getConfig('_PRIME')).$server.getConfig('ENCRYPT_SEPERATOR').$keys.getConfig('ENCRYPT_SEPERATOR').$data.getConfig('ENCRYPT_SEPERATOR').getConfig('DATE_KEY').getConfig('ENCRYPT_SEPERATOR').$a);
 		//* DEBUG: */ echo "SHA1=".$sha1." (".strlen($sha1).")<br />";
 		$sha1 = scrambleString($sha1);
 		//* DEBUG: */ echo "Scrambled=".$sha1." (".strlen($sha1).")<br />";
@@ -2095,10 +2081,10 @@ function scrambleString($str) {
 		return $str;
 	} elseif (strlen($str) == 40) {
 		// From database
-		$scrambleNums = explode(":", getConfig('pass_scramble'));
+		$scrambleNums = explode(':', getConfig('pass_scramble'));
 	} else {
 		// Generate new numbers
-		$scrambleNums = explode(":", genScrambleString(strlen($str)));
+		$scrambleNums = explode(':', genScrambleString(strlen($str)));
 	}
 
 	// Scramble string here
@@ -2122,7 +2108,7 @@ function descrambleString($str) {
 	if (strlen($str) != 40) return $str;
 
 	// Load numbers from config
-	$scrambleNums = explode(":", getConfig('pass_scramble'));
+	$scrambleNums = explode(':', getConfig('pass_scramble'));
 
 	// Validate numbers
 	if (count($scrambleNums) != 40) return $str;
@@ -2160,42 +2146,17 @@ function genScrambleString ($len) {
 	} // END - for
 
 	// So let's create the string for storing it in database
-	$scrambleString = implode(":", $scrambleNumbers);
+	$scrambleString = implode(':', $scrambleNumbers);
 	return $scrambleString;
 }
 
-// Append data like session ID or referal ID to the given URL which would
-// normally be stored in cookies
-function ADD_URL_DATA ($URL) {
-	// Init add
-	$add = '';
-
-	// Determine URL binder
-	$BIND = "?";
-	if (strpos($URL, "?") !== false) $BIND = "&amp;";
-
-	if ((!defined('__COOKIES')) || ((!__COOKIES))) {
-		// 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)) {
-			// Not found! So let's set default here
-			$add .= $BIND."refid=".getConfig('def_refid');
-		}
-	} // END - if
-
-	// Add all together and return it
-	return $URL . $add;
-}
-
 // Generate an PGP-like encrypted hash of given hash for e.g. cookies
 function generatePassString ($passHash) {
 	// Return vanilla password hash
 	$ret = $passHash;
 
 	// Is a secret key and master salt already initialized?
-	if ((getConfig('secret_key') != "") && (getConfig('master_salt') != "")) {
+	if ((getConfig('secret_key') != '') && (getConfig('master_salt') != '')) {
 		// Only calculate when the secret key is generated
 		$newHash = ''; $start = 9;
 		for ($idx = 0; $idx < 10; $idx++) {
@@ -2203,18 +2164,18 @@ function generatePassString ($passHash) {
 			$part2 = hexdec(substr(getConfig('secret_key'), $start, 4));
 			$mod = dechex($idx);
 			if ($part1 > $part2) {
-				$mod = dechex(sqrt(($part1 - $part2) * constant('_PRIME') / pi()));
+				$mod = dechex(sqrt(($part1 - $part2) * getConfig('_PRIME') / pi()));
 			} elseif ($part2 > $part1) {
-				$mod = dechex(sqrt(($part2 - $part1) * constant('_PRIME') / pi()));
+				$mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi()));
 			}
 			$mod = substr(round($mod), 0, 4);
 			$mod = str_repeat('0', 4-strlen($mod)).$mod;
-			//* DEBUG: */ echo "*".$start."=".$mod."*<br />";
+			//* DEBUG: */ echo "*".$start.'='.$mod."*<br />";
 			$start += 4;
 			$newHash .= $mod;
 		} // END - for
 
-		//* DEBUG: */ print($passHash."<br />".$newHash." (".strlen($newHash).")");
+		//* DEBUG: */ print($passHash."<br />".$newHash." (".strlen($newHash).')');
 		$ret = generateHash($newHash, getConfig('master_salt'));
 		//* DEBUG: */ print($ret."<br />\n");
 	} else {
@@ -2229,39 +2190,45 @@ function generatePassString ($passHash) {
 }
 
 // Fix "deleted" cookies
-function FIX_DELETED_COOKIES ($cookies) {
+function fixDeletedCookies ($cookies) {
 	// Is this an array with entries?
 	if ((is_array($cookies)) && (count($cookies) > 0)) {
 		// Then check all cookies if they are marked as deleted!
 		foreach ($cookies as $cookieName) {
 			// Is the cookie set to "deleted"?
-			if (get_session($cookieName) == "deleted") {
-				set_session($cookieName, '');
-			}
+			if (getSession($cookieName) == 'deleted') {
+				setSession($cookieName, '');
+			} // END - if
 		} // END - foreach
 	} // END - if
 }
 
 // Output error messages in a fasioned way and die...
 function app_die ($F, $L, $msg) {
-	// Load header
-	LOAD_INC_ONCE('inc/header.php');
+	// Check if Script is already dieing and not let it kill itself another 1000 times
+	if (!isset($GLOBALS['app_died'])) {
+		// Make sure, that the script realy realy diese here and now
+		$GLOBALS['app_died'] = true;
 
-	// Prepare message for output
-	$msg = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $msg);
+		// Load header
+		loadIncludeOnce('inc/header.php');
 
-	// Load the message template
-	LOAD_TEMPLATE('admin_settings_saved', false, $msg);
+		// Prepare message for output
+		$msg = sprintf(getMessage('MXCHANGE_HAS_DIED'), basename($F), $L, $msg);
 
-	// Load footer
-	LOAD_INC_ONCE('inc/footer.php');
+		// Load the message template
+		LOAD_TEMPLATE('admin_settings_saved', false, $msg);
 
-	// Exit explicitly
-	shutdown();
+		// Load footer
+		loadIncludeOnce('inc/footer.php');
+	} else {
+		// Script tried to kill itself twice
+		debug_report_bug('Script wanted to kill itself more than once! Raw message=' . $msg . ', file/function=' . $F . ', line=' . $L);
+	}
 }
 
 // Display parsing time and number of SQL queries in footer
-function DISPLAY_PARSING_TIME_FOOTER() {
+function displayParsingTime() {
 	// Is the timer started?
 	if (!isset($GLOBALS['startTime'])) {
 		// Abort here
@@ -2272,11 +2239,11 @@ function DISPLAY_PARSING_TIME_FOOTER() {
 	$endTime = microtime(true);
 
 	// "Explode" both times
-	$start = explode(" ", $GLOBALS['startTime']);
-	$end = explode(" ", $endTime);
+	$start = explode(' ', $GLOBALS['startTime']);
+	$end = explode(' ', $endTime);
 	$runTime = $end[0] - $start[0];
 	if ($runTime < 0) $runTime = 0;
-	$runTime = TRANSLATE_COMMA($runTime);
+	$runTime = translateComma($runTime);
 
 	// Prepare output
 	$content = array(
@@ -2286,7 +2253,7 @@ function DISPLAY_PARSING_TIME_FOOTER() {
 	);
 
 	// Load the template
-	LOAD_TEMPLATE("show_timings", false, $content);
+	LOAD_TEMPLATE('show_timings', false, $content);
 }
 
 // Check wether a boolean constant is set
@@ -2319,89 +2286,64 @@ function isBooleanConstantAndTrue ($constName) { // : Boolean
 }
 
 // Checks if a given apache module is loaded
-function IF_APACHE_MODULE_LOADED ($apacheModule) {
+function isApacheModuleLoaded ($apacheModule) {
 	// Check it and return result
 	return (((function_exists('apache_get_modules')) && (in_array($apacheModule, apache_get_modules()))) || (!function_exists('apache_get_modules')));
 }
 
-// "Getter" for language strings
-// @TODO Rewrite all language constants to this function.
-function getMessage ($messageId) {
-	// Default is not found!
-	$return = "!".$messageId."!";
-
-	// Is the language string found?
-	if (isset($GLOBALS['msg'][strtolower($messageId)])) {
-		// Language array element found in small_letters
-		$return = $GLOBALS['msg'][$messageId];
-	} elseif (isset($GLOBALS['msg'][strtoupper($messageId)])) {
-		// @DEPRECATED Language array element found in BIG_LETTERS
-		$return = $GLOBALS['msg'][$messageId];
-	} elseif (defined($messageId)) {
-		// @DEPRECATED Deprecated constant found
-		$return = constant($messageId);
-	} else {
-		// Missing language constant
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Missing message string %s detected.", $messageId));
-	}
-
-	// Return the string
-	return $return;
-}
-
 // Get current theme name
-function GET_CURR_THEME() {
+function getCurrentTheme() {
 	// The default theme is 'default'... ;-)
-	$ret = "default";
+	$ret = 'default';
 
 	// Load default theme if not empty from configuration
-	if (getConfig('default_theme') != "") $ret = getConfig('default_theme');
+	if (getConfig('default_theme') != '') $ret = getConfig('default_theme');
 
 	if (!isSessionVariableSet('mxchange_theme')) {
 		// Set default theme
-		set_session('mxchange_theme', $ret);
+		setSession('mxchange_theme', $ret);
 	} 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');
+		$ret = getSession('mxchange_theme');
 
 		// Is it valid?
-		if (THEME_GET_ID($ret) == 0) {
+		if (getThemeId($ret) == 0) {
 			// Fix it to default
-			$ret = "default";
+			$ret = 'default';
 		} // END - if
 	} 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'));
 
 		// Installation mode active
-		if ((REQUEST_ISSET_GET('theme')) && (FILE_READABLE($theme))) {
+		if ((REQUEST_ISSET_GET('theme')) && (isFileReadable($theme))) {
 			// Set cookie from URL data
-			set_session('mxchange_theme', REQUEST_GET('theme'));
-		} elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) {
+			setSession('mxchange_theme', REQUEST_GET('theme'));
+		} elseif (isFileReadable(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')));
+			setSession('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme')));
 		}
 
 		// Set return value
-		$ret = get_session('mxchange_theme');
+		$ret = getSession('mxchange_theme');
 	} else {
 		// Invalid design, reset cookie
-		set_session('mxchange_theme', $ret);
+		setSession('mxchange_theme', $ret);
 	}
 
 	// Add (maybe) found theme.php file to inclusion list
 	$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($ret));
 
 	// Try to load the requested include file
-	if (INCLUDE_READABLE($INC)) ADD_INC_TO_POOL($INC);
+	if (isIncludeReadable($INC)) ADD_INC_TO_POOL($INC);
 
 	// Return theme value
 	return $ret;
 }
 
 // Get id from theme
-function THEME_GET_ID ($name) {
+function getThemeId ($name) {
 	// Is the extension 'theme' installed?
 	if (!EXT_IS_ACTIVE('theme')) {
 		// Then abort here
@@ -2420,8 +2362,8 @@ function THEME_GET_ID ($name) {
 		incrementConfigEntry('cache_hits');
 	} 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__);
+		$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
+		array($name), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -2437,62 +2379,8 @@ function THEME_GET_ID ($name) {
 	return $id;
 }
 
-// Read a given file
-function READ_FILE ($FQFN, $sqlPrepare = false) {
-	// Load the file
-	if (function_exists('file_get_contents')) {
-		// Use new function
-		$content = file_get_contents($FQFN);
-	} else {
-		// Fall-back to implode-file chain
-		$content = implode("", file($FQFN));
-	}
-
-	// Prepare SQL queries?
-	if ($sqlPrepare === true) {
-		// Remove some unwanted chars
-		$content = str_replace("\r", '', $content);
-		$content = str_replace("\n\n", "\n", $content);
-	} // END - if
-
-	// Return the content
-	return $content;
-}
-
-// Writes content to a file
-function WRITE_FILE ($FQFN, $content) {
-	// Is the file writeable?
-	if ((FILE_READABLE($FQFN)) && (!is_writeable($FQFN)) && (!chmod($FQFN, 0644))) {
-		// Not writeable!
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("File %s not writeable.", basename($FQFN)));
-
-		// Failed! :(
-		return false;
-	} // END - if
-
-	// By default all is failed...
-	$return = false;
-
-	// Is the function there?
-	if (function_exists('file_put_contents')) {
-		// Write it directly
-		$return = file_put_contents($FQFN, $content);
-	} else {
-		// Write it with fopen
-		$fp = fopen($FQFN, 'w') or app_die(__FUNCTION__, __LINE__, "Cannot write file ".basename($FQFN)."!");
-		fwrite($fp, $content);
-		fclose($fp);
-
-		// Set CHMOD rights
-		$return = chmod($FQFN, 0644);
-	}
-
-	// Return status
-	return $return;
-}
-
 // Generates an error code from given account status
-function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
+function generateErrorCodeFromUserStatus ($status) {
 	// Default error code if unknown account status
 	$errorCode = getCode('UNKNOWN_STATUS');
 
@@ -2512,39 +2400,30 @@ function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
 	return $errorCode;
 }
 
-// Clears the output buffer. This function does *NOT* backup sent content.
-function clearOutputBuffer () {
-	// Trigger an error on failure
-	if (!ob_end_clean()) {
-		// Failed!
-		debug_report_bug(__FUNCTION__.": Failed to clean output buffer.");
-	} // END - if
-}
-
 // Function to search for the last modifified file
 function searchDirsRecursive ($dir, &$last_changed) {
 	// Get dir as array
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):dir=".$dir."<br />\n";
 	// 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
+	// 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);
+	$ds = getArrayFromDirectory($dir, '', true, false, $excludePattern);
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):ds[]=".count($ds)."<br />\n";
 
 	// Walk through all entries
 	foreach ($ds as $d) {
 		// Generate proper FQFN
-		$FQFN = str_replace("//", "/", constant('PATH') . $dir. "/". $d);
+		$FQFN = str_replace("//", '/', constant('PATH') . $dir. '/'. $d);
 
 		// 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
+			// $FQFN is a directory so also crawl into this directory
 			$newDir = $d;
-			if (!empty($dir)) $newDir = $dir . "/". $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)) {
+		} elseif (isFileReadable($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";
@@ -2567,8 +2446,8 @@ function getActualVersion ($type = 'Revision') {
 		// 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;
+		|| count($GLOBALS['cache_array']['revision']) < 3
+		|| !$GLOBALS['cache_instance']->loadCacheFile('revision')) $new = true;
 
 		// Is the cache file outdated/invalid?
 		if ($new === true){
@@ -2578,7 +2457,7 @@ function getActualVersion ($type = 'Revision') {
 			unset($GLOBALS['cache_array']['revision']);
 
 			// Reload load_cach-revison.php
-			LOAD_INC('inc/loader/load_cache-revision.php');
+			loadInclude('inc/loader/load_cache-revision.php');
 		} // END - if
 
 		// Return found value
@@ -2596,19 +2475,19 @@ function getActualVersion ($type = 'Revision') {
 			$new = true;
 		} else {
 			// Check for revision file
-			if (!FILE_READABLE($FQFN)) {
+			if (!isFileReadable($FQFN)) {
 				// Not found, so we need to create it
 				$new = true;
 			} else {
 				// Revision file found
-				$ins_vers = explode("\n", READ_FILE($FQFN));
+				$ins_vers = explode("\n", readFromFile($FQFN));
 
 				// Get array for mapping information
 				$mapper = array_flip(getSearchFor());
 				//* DEBUG: */ print("<pre>".print_r($mapper, true).print_r($ins_vers, true)."</pre>");
 
 				// Is the content valid?
-				if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == "") || ($ins_vers[0]) == "new") {
+				if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$mapper[$type]])) || (trim($ins_vers[$mapper[$type]]) == '') || ($ins_vers[0]) == "new") {
 					// File needs update!
 					$new = true;
 				} else {
@@ -2620,13 +2499,13 @@ function getActualVersion ($type = 'Revision') {
 
 		// Has it been updated?
 		if ($new === true)  {
-			WRITE_FILE($FQFN, implode("\n", getAkt_vers()));
+			writeToFile($FQFN, implode("\n", getArrayFromActualVersion()));
 		} // END - if
 	}
 }
 
 // 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
+// The returned Array is needed twice (in getArrayFromActualVersion() 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');
@@ -2635,11 +2514,12 @@ function getSearchFor () {
 	return $searchFor;
 }
 
-function getAkt_vers () {
+// @TODO Please describe this function
+function getArrayFromActualVersion () {
 	// Init variables
 	$next_dir = ''; // Directory to start with search
 	$last_changed = array(
-		'path_name' => "",
+		'path_name' => '',
 		'time'      => 0
 	);
 	$akt_vers = array(); // Init return array
@@ -2649,7 +2529,7 @@ function getAkt_vers () {
 	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']);
+	$last_file = readFromFile($last_changed['path_name']);
 
 	// Get all the keywords to search for
 	$searchFor = getSearchFor();
@@ -2667,9 +2547,9 @@ function getAkt_vers () {
 
 	// 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'] != '') {
+	&& 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
@@ -2683,7 +2563,7 @@ function getAkt_vers () {
 
 	} else {
 		// 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");
+		$version = sendGetRequest('check-updates3.php');
 
 		// Prepare content
 		// Only sets not setted or not proper values to the Online-Server-Fallback-Solution
@@ -2697,35 +2577,6 @@ function getAkt_vers () {
 	return $akt_vers;
 }
 
-
-// Loads an include file and logs any missing files for debug purposes
-function LOAD_INC ($INC) {
-	// Add the path. This is why we need a trailing slash in config.php
-	$FQFN = constant('PATH') . $INC;
-
-	// Is the include file there?
-	if (!INCLUDE_READABLE($INC)) {
-		// Not there so log it
-		debug_report_bug(sprintf("Include file %s not found.", $INC));
-		return false;
-	} // END - if
-
-	// Try to load it
-	require($FQFN);
-}
-
-// Loads an include file once
-function LOAD_INC_ONCE ($INC) {
-	// Is it not loaded?
-	if (!isset($GLOBALS['load_once'][$INC])) {
-		// Then try to load it
-		LOAD_INC($INC);
-
-		// And mark it as loaded
-		$GLOBALS['load_once'][$INC] = "loaded";
-	} // END - if
-}
-
 // Back-ported from the new ship-simu engine. :-)
 function debug_get_printable_backtrace () {
 	// Init variable
@@ -2737,7 +2588,7 @@ function debug_get_printable_backtrace () {
 		if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
 		if (!isset($trace['line'])) $trace['line'] = __LINE__;
 		if (!isset($trace['args'])) $trace['args'] = array();
-		$backtrace .= "<li class=\"debug_list\"><span class=\"backtrace_file\">".basename($trace['file'])."</span>:".$trace['line'].", <span class=\"backtrace_function\">".$trace['function']."(".count($trace['args']).")</span></li>\n";
+		$backtrace .= "<li class=\"debug_list\"><span class=\"backtrace_file\">".basename($trace['file'])."</span>:".$trace['line'].", <span class=\"backtrace_function\">".$trace['function'].'('.count($trace['args']).")</span></li>\n";
 	} // END - foreach
 
 	// Close it
@@ -2748,14 +2599,14 @@ function debug_get_printable_backtrace () {
 }
 
 // Output a debug backtrace to the user
-function debug_report_bug ($message = "") {
+function debug_report_bug ($message = '') {
 	// Init message
 	$debug = '';
 	// Is the optional message set?
 	if (!empty($message)) {
 		// Use and log it
 		$debug = sprintf("Note: %s<br />\n",
-			$message
+		$message
 		);
 
 		// @TODO Add a little more infos here
@@ -2763,9 +2614,9 @@ function debug_report_bug ($message = "") {
 	} // END - if
 
 	// Add output
-	$debug .= "Please report this bug at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>";
+	$debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a> and include the logfile from <strong>inc/cache/debug.log</strong> in your report (you cannot attach files!):<pre>";
 	$debug .= debug_get_printable_backtrace();
-	$debug .= "</pre>Request-URI: ".$_SERVER['REQUEST_URI']."<br />\n";
+	$debug .= "</pre>\nRequest-URI: ".$_SERVER['REQUEST_URI']."<br />\n";
 	$debug .= "Thank you for finding bugs.";
 
 	// And abort here
@@ -2801,8 +2652,8 @@ function convertCodeToMessage ($code) {
 			break;
 
 		case getCode('EXTENSION_PROBLEM'):
-			if (REQUEST_ISSET_GET(('ext'))) {
-				$msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), REQUEST_GET(('ext')));
+			if (REQUEST_ISSET_GET('ext')) {
+				$msg = sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), REQUEST_GET('ext'));
 			} else {
 				$msg = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
 			}
@@ -2827,21 +2678,21 @@ function convertCodeToMessage ($code) {
 }
 
 // Generate a "link" for the given admin id (aid)
-function GENERATE_AID_LINK ($aid) {
+function generateAdminLink ($aid) {
 	// No assigned admin is default
 	$admin = "<span class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>";
 
 	// Zero? = Not assigned
 	if (bigintval($aid) > 0) {
 		// Load admin's login
-		$login = GET_ADMIN_LOGIN($aid);
+		$login = getAdminLogin($aid);
 
 		// Is the login valid?
-		if ($login != "***") {
+		if ($login != '***') {
 			// Is the extension there?
 			if (EXT_IS_ACTIVE('admins')) {
 				// Admin found
-				$admin = "<a href=\"".ADMINS_CREATE_EMAIL_LINK(GET_ADMIN_EMAIL($aid))."\">".$login."</a>";
+				$admin = "<a href=\"".adminsCreateEmailLink(getAdminEmail($aid))."\">".$login."</a>";
 			} else {
 				// Extension not found
 				$admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
@@ -2856,45 +2707,22 @@ function GENERATE_AID_LINK ($aid) {
 	return $admin;
 }
 
-// Checks wether an include file (non-FQFN better) is readable
-function INCLUDE_READABLE ($INC) {
-	// Construct FQFN
-	$FQFN = constant('PATH') . $INC;
-
-	// Is it readable?
-	return FILE_READABLE($FQFN);
-}
-
-// Encode strings
-// @TODO Implement $compress
-function encodeString ($str, $compress=true) {
-	$str = urlencode(base64_encode(compileUriCode($str)));
-	return $str;
-}
-
-// Decode strings encoded with encodeString()
-// @TODO Implement $decompress
-function decodeString ($str, $decompress=true) {
-	$str = compileUriCode(base64_decode(urldecode(compileUriCode($str))));
-	return $str;
-}
-
 // Compile characters which are allowed in URLs
 function compileUriCode ($code, $simple=true) {
 	// Compile constants
 	if (!$simple) $code = str_replace("{--", '".', str_replace("--}", '."', $code));
 
 	// Compile QUOT and other non-HTML codes
-	$code = str_replace("{DOT}", ".",
-		str_replace("{SLASH}", "/",
-		str_replace("{QUOT}", "'",
-		str_replace("{DOLLAR}", "$",
-		str_replace("{OPEN_ANCHOR}", "(",
-		str_replace("{CLOSE_ANCHOR}", ")",
-		str_replace("{OPEN_SQR}", "[",
-		str_replace("{CLOSE_SQR}", "]",
-		str_replace("{PER}", "%",
-		$code
+	$code = str_replace('{DOT}', '.',
+	str_replace('{SLASH}', '/',
+	str_replace('{QUOT}', "'",
+	str_replace('{DOLLAR}', '$',
+	str_replace('{OPEN_ANCHOR}', '(',
+	str_replace('{CLOSE_ANCHOR}', ')',
+	str_replace('{OPEN_SQR}', '[',
+	str_replace('{CLOSE_SQR}', ']',
+	str_replace('{PER}', '%',
+	$code
 	)))))))));
 
 	// Return compiled code
@@ -2902,7 +2730,7 @@ function compileUriCode ($code, $simple=true) {
 }
 
 // Function taken from user comments on www.php.net / function eregi()
-function isUrlValid ($url) {
+function isUrlValidSimple ($url) {
 	// Prepare URL
 	$url = strip_tags(str_replace("\\", '', compileUriCode(urldecode($url))));
 
@@ -2925,9 +2753,9 @@ function isUrlValid ($url) {
 	$pattern['d2dpg1']  = $http.$domain2.$dir.$page.$getstring1;
 	$pattern['ipdpg1']  = $http.$ip.$dir.$page.$getstring1;
 	// Pattern for URLs like http://url/dir/?var=value
-	$pattern['d1dg1']  = $http.$domain1.$dir."/".$getstring1;
-	$pattern['d2dg1']  = $http.$domain2.$dir."/".$getstring1;
-	$pattern['ipdg1']  = $http.$ip.$dir."/".$getstring1;
+	$pattern['d1dg1']  = $http.$domain1.$dir.'/'.$getstring1;
+	$pattern['d2dg1']  = $http.$domain2.$dir.'/'.$getstring1;
+	$pattern['ipdg1']  = $http.$ip.$dir.'/'.$getstring1;
 	// Pattern for URLs like http://url/dir/page.ext
 	$pattern['d1dp']  = $http.$domain1.$dir.$page;
 	$pattern['d1dp']  = $http.$domain2.$dir.$page;
@@ -2937,9 +2765,9 @@ function isUrlValid ($url) {
 	$pattern['d2d']  = $http.$domain2.$dir;
 	$pattern['ipd']  = $http.$ip.$dir;
 	// Pattern for URLs like http://url/?var=value
-	$pattern['d1g1']  = $http.$domain1."/".$getstring1;
-	$pattern['d2g1']  = $http.$domain2."/".$getstring1;
-	$pattern['ipg1']  = $http.$ip."/".$getstring1;
+	$pattern['d1g1']  = $http.$domain1.'/'.$getstring1;
+	$pattern['d2g1']  = $http.$domain2.'/'.$getstring1;
+	$pattern['ipg1']  = $http.$ip.'/'.$getstring1;
 	// Pattern for URLs like http://url?var=value
 	$pattern['d1g12']  = $http.$domain1.$getstring1;
 	$pattern['d2g12']  = $http.$domain2.$getstring1;
@@ -2952,7 +2780,7 @@ function isUrlValid ($url) {
 			$pat = str_replace("[:alnum:]", "0-9a-zA-Z", $pat);
 			$pat = str_replace("[:alpha:]", "a-zA-Z", $pat);
 			$pat = str_replace("[:digit:]", "0-9", $pat);
-			$pat = str_replace(".", "\.", $pat);
+			$pat = str_replace('.', "\.", $pat);
 			$pat = str_replace("@", "\@", $pat);
 			echo $key."=&nbsp;".$pat."<br />";
 		}
@@ -2968,23 +2796,8 @@ function isUrlValid ($url) {
 	return $reg;
 }
 
-// Smartly adds slashes
-function smartAddSlashes ($unquoted) {
-	$unquoted = str_replace("\\", '', $unquoted);
-	return addslashes($unquoted);
-}
-
-// Decode entities in a nicer way
-function decodeEntities ($str) {
-	// @TODO We may want to switch over to UTF-8 here!
-	$decodedString = html_entity_decode($str, ENT_NOQUOTES, "ISO-8859-15");
-
-	// Return decoded string
-	return $decodedString;
-}
-
 // Wtites data to a config.php-style file
-// @TODO Rewrite this function to use READ_FILE() and WRITE_FILE()
+// @TODO Rewrite this function to use readFromFile() and writeToFile()
 function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 	// Initialize some variables
 	$done = false;
@@ -2993,17 +2806,17 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 	$found = false;
 
 	// Is the file there and read-/write-able?
-	if ((FILE_READABLE($FQFN)) && (is_writeable($FQFN))) {
-		$search = "CFG: ".$comment;
-		$tmp = $FQFN.".tmp";
+	if ((isFileReadable($FQFN)) && (is_writeable($FQFN))) {
+		$search = 'CFG: ' . $comment;
+		$tmp = $FQFN . '.tmp';
 
 		// Open the source file
-		$fp = fopen($FQFN, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$FQFN."<br />");
+		$fp = fopen($FQFN, 'r') or OUTPUT_HTML('<strong>READ:</strong> ' . $FQFN . "<br />\n");
 
 		// Is the resource valid?
 		if (is_resource($fp)) {
 			// Open temporary file
-			$fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
+			$fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML('<strong>WRITE:</strong> ' . $tmp . "<br />\n");
 
 			// Is the resource again valid?
 			if (is_resource($fp_tmp)) {
@@ -3016,7 +2829,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 					if ($next > -1) {
 						if ($next === $seek) {
 							$next = -1;
-							$line = $prefix . $DATA . $suffix."\n";
+							$line = $prefix . $DATA . $suffix . "\n";
 						} else {
 							$next++;
 						}
@@ -3024,38 +2837,38 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 
 					// Write to temp file
 					fputs($fp_tmp, $line);
-				}
+				} // END - while
 
 				// Close temp file
 				fclose($fp_tmp);
 
 				// Finished writing tmp file
 				$done = true;
-			}
+			} // END - if
 
 			// Close source file
 			fclose($fp);
 
-			if (($done) && ($found)) {
+			if (($done === true) && ($found === true)) {
 				// Copy back tmp file and delete tmp :-)
-				copy($tmp, $FQFN);
-				return unlink($tmp);
-			} elseif (!$found) {
-				OUTPUT_HTML("<strong>CHANGE:</strong> 404!");
+				copyFileVerified($tmp, $FQFN, 0644);
+				return removeFile($tmp);
+			} elseif ($found === false) {
+				OUTPUT_HTML('<strong>CHANGE:</strong> 404!');
 			} else {
-				OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
+				OUTPUT_HTML('<strong>TMP:</strong> UNDONE!');
 			}
 		}
 	} else {
 		// File not found, not readable or writeable
-		OUTPUT_HTML("<strong>404:</strong> ".$FQFN."<br />");
+		OUTPUT_HTML('<strong>404:</strong> ' . $FQFN . '<br />');
 	}
 
 	// An error was detected!
 	return false;
 }
 // Send notification to admin
-function SEND_ADMIN_NOTIFICATION ($subject, $templateName, $content=array(), $uid="0") {
+function sendAdminNotification ($subject, $templateName, $content=array(), $uid = '0') {
 	if (GET_EXT_VERSION('admins') >= '0.4.1') {
 		// Send new way
 		SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);
@@ -3066,26 +2879,6 @@ function SEND_ADMIN_NOTIFICATION ($subject, $templateName, $content=array(), $ui
 	}
 }
 
-// Merges an array together but only if both are arrays
-function merge_array ($array1, $array2) {
-	// Are both an array?
-	if ((is_array($array1)) && (is_array($array2))) {
-		// Merge all together
-		return array_merge($array1, $array2);
-	} elseif (is_array($array1)) {
-		// Return left array
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
-		return $array1;
-	} elseif (is_array($array2)) {
-		// Return right array
-		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
-		return $array2;
-	}
-
-	// Both are not arrays
-	debug_report_bug(__FUNCTION__.": No arrays provided!");
-}
-
 // Debug message logger
 function DEBUG_LOG ($funcFile, $line, $message, $force=true) {
 	// Is debug mode enabled?
@@ -3109,35 +2902,35 @@ function runResetIncludes () {
 	} // END - if
 
 	// Get more daily reset scripts
-	SET_INC_POOL(GET_DIR_AS_ARRAY("inc/reset/", "reset_"));
+	SET_INC_POOL(getArrayFromDirectory('inc/reset/', 'reset_'));
 
 	// Update database
-	if (!defined('DEBUG_RESET')) UPDATE_CONFIG("last_update", time());
+	if (getConfig('DEBUG_RESET') != 'Y') updateConfiguration('last_update', time());
 
 	// Is the config entry set?
 	if (GET_EXT_VERSION('sql_patches') >= '0.4.2') {
 		// Create current week mark
-		$currWeek = date("W", time());
+		$currWeek = date('W', time());
 
 		// Has it changed?
 		if (getConfig('last_week') != $currWeek) {
 			// Include weekly reset scripts
-			MERGE_INC_POOL(GET_DIR_AS_ARRAY("inc/weekly/", "weekly_"));
+			MERGE_INC_POOL(getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
 			// Update config
-			if (!defined('DEBUG_WEEKLY')) UPDATE_CONFIG("last_week", $currWeek);
+			if (getConfig('DEBUG_WEEKLY') != 'Y') updateConfiguration('last_week', $currWeek);
 		} // END - if
 
 		// Create current month mark
-		$currMonth = date("m", time());
+		$currMonth = date('m', time());
 
 		// Has it changed?
 		if (getConfig('last_month') != $currMonth) {
 			// Include monthly reset scripts
-			MERGE_INC_POOL(GET_DIR_AS_ARRAY("inc/monthly/", "monthly_"));
+			MERGE_INC_POOL(getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
 			// Update config
-			if (!defined('DEBUG_MONTHLY')) UPDATE_CONFIG("last_month", $currMonth);
+			if (getConfig('DEBUG_MONTHLY') != 'Y') updateConfiguration('last_month', $currMonth);
 		} // END - if
 	} // END - if
 
@@ -3146,7 +2939,7 @@ function runResetIncludes () {
 }
 
 // Handle extra values
-function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
+function handleExtraValues ($filterFunction, $value, $extraValue) {
 	// Default is the value itself
 	$ret = $value;
 
@@ -3178,14 +2971,8 @@ function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
 	return $ret;
 }
 
-// Check if given FQFN is a readable file
-function FILE_READABLE ($FQFN) {
-	// Check all...
-	return ((file_exists($FQFN)) && (is_file($FQFN)) && (is_readable($FQFN)));
-}
-
 // Converts timestamp selections into a timestamp
-function CONVERT_SELECTIONS_TO_TIMESTAMP (&$POST, &$DATA, &$id, &$skip) {
+function convertSelectionsToTimestamp (&$POST, &$DATA, &$id, &$skip) {
 	// Init test variable
 	$test2 = '';
 
@@ -3193,17 +2980,17 @@ function CONVERT_SELECTIONS_TO_TIMESTAMP (&$POST, &$DATA, &$id, &$skip) {
 	$test = substr($id, -3);
 
 	// Improved way of checking! :-)
-	if (in_array($test, array("_ye", "_mo", "_we", "_da", "_ho", "_mi", "_se"))) {
+	if (in_array($test, array('_ye', '_mo', '_we', '_da', '_ho', '_mi', '_se'))) {
 		// Found a multi-selection for timings?
 		$test = substr($id, 0, -3);
-		if ((isset($POST[$test."_ye"])) && (isset($POST[$test."_mo"])) && (isset($POST[$test."_we"])) && (isset($POST[$test."_da"])) && (isset($POST[$test."_ho"])) && (isset($POST[$test."_mi"])) && (isset($POST[$test."_se"])) && ($test != $test2)) {
+		if ((isset($POST[$test.'_ye'])) && (isset($POST[$test.'_mo'])) && (isset($POST[$test.'_we'])) && (isset($POST[$test.'_da'])) && (isset($POST[$test.'_ho'])) && (isset($POST[$test.'_mi'])) && (isset($POST[$test.'_se'])) && ($test != $test2)) {
 			// Generate timestamp
-			$POST[$test] = CREATE_TIMESTAMP_FROM_SELECTIONS($test, $POST);
+			$POST[$test] = createTimestampFromSelections($test, $POST);
 			$DATA[] = sprintf("%s='%s'", $test, $POST[$test]);
 
 			// Remove data from array
-			foreach (array("ye", "mo", "we", "da", "ho", "mi", "se") as $rem) {
-				unset($POST[$test."_".$rem]);
+			foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) {
+				unset($POST[$test.'_'.$rem]);
 			} // END - foreach
 
 			// Skip adding
@@ -3217,23 +3004,23 @@ function CONVERT_SELECTIONS_TO_TIMESTAMP (&$POST, &$DATA, &$id, &$skip) {
 }
 
 // Reverts the german decimal comma into Computer decimal dot
-function REVERT_COMMA ($str) {
+function convertCommaToDot ($str) {
 	// Default float is not a float... ;-)
 	$float = false;
 
 	// Which language is selected?
-	switch (GET_LANGUAGE()) {
-		case "de": // German language
+	switch (getLanguage()) {
+		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);
+			$float = (float)str_replace(',', '.', $str);
 			break;
 
 		default: // US and so on
 			// Remove thousand dots first and cast
-			$float = (float)str_replace(",", '', $str);
+			$float = (float)str_replace(',', '', $str);
 			break;
 	}
 
@@ -3249,21 +3036,21 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 	// Is the session data set?
 	if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
 		// Ignore zero values
-		if (get_session('mxchange_'.$accessLevel.'_failures') > 0) {
+		if (getSession('mxchange_'.$accessLevel.'_failures') > 0) {
 			// Non-guest has login failures found, get both data and prepare it for template
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):accessLevel={$accessLevel}<br />\n";
 			$content = array(
-				'login_failures' => get_session('mxchange_'.$accessLevel.'_failures'),
-				'last_failure'   => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
+				'login_failures' => getSession('mxchange_'.$accessLevel.'_failures'),
+				'last_failure'   => generateDateTime(getSession('mxchange_'.$accessLevel.'_last_fail'), '2')
 			);
 
 			// Load template
-			$OUT = LOAD_TEMPLATE("login_failures", true, $content);
+			$OUT = LOAD_TEMPLATE('login_failures', true, $content);
 		} // END - if
 
 		// Reset session data
-		set_session('mxchange_'.$accessLevel.'_failures', '');
-		set_session('mxchange_'.$accessLevel.'_last_fail', '');
+		setSession('mxchange_'.$accessLevel.'_failures', '');
+		setSession('mxchange_'.$accessLevel.'_last_fail', '');
 	} // END - if
 
 	// Return rendered content
@@ -3271,7 +3058,7 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 }
 
 // Rebuild cache
-function rebuildCacheFiles ($cache, $inc="") {
+function rebuildCacheFiles ($cache, $inc = '') {
 	// Shall I remove the cache file?
 	if ((EXT_IS_ACTIVE('cache')) && (isCacheInstanceValid())) {
 		// Rebuild cache
@@ -3286,10 +3073,10 @@ function rebuildCacheFiles ($cache, $inc="") {
 			$INC = sprintf("inc/loader/load_cache-%s.php", $inc);
 
 			// Is the include there?
-			if (INCLUDE_READABLE($INC)) {
+			if (isIncludeReadable($INC)) {
 				// And rebuild it from scratch
 				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): inc={$inc} - LOADED!<br />\n";
-				LOAD_INC($INC);
+				loadInclude($INC);
 			} else {
 				// Include not found!
 				DEBUG_LOG(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
@@ -3299,7 +3086,7 @@ function rebuildCacheFiles ($cache, $inc="") {
 }
 
 // Purge admin menu cache
-function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
+function cachePurgeAdminMenu ($id=0, $action = '', $what = '', $str = '') {
 	// Is the cache extension enabled or no cache instance or admin menu cache disabled?
 	if (!EXT_IS_ACTIVE('cache')) {
 		// Cache extension not active
@@ -3317,24 +3104,6 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
 	debug_report_bug("<strong>Experimental feature:</strong> You have to delete the admin_*.cache files by yourself at this point.");
 }
 
-// Translates the "pool type" into human-readable
-function TRANSLATE_POOL_TYPE ($type) {
-	// Default?type is unknown
-	$translated = sprintf(getMessage('POOL_TYPE_UNKNOWN'), $type);
-
-	// Generate constant
-	$constName = sprintf("POOL_TYPE_%s", $type);
-
-	// Does it exist?
-	if (defined($constName)) {
-		// Then use it
-		$translated = getMessage($constName);
-	} // END - if
-
-	// Return "translation"
-	return $translated;
-}
-
 // Determines the real remote address
 function determineRealRemoteAddress () {
 	// Is a proxy in use?
@@ -3350,8 +3119,8 @@ function determineRealRemoteAddress () {
 	}
 
 	// This strips out the real address from proxy output
-	if (strstr($address, ",")){
-		$addressArray = explode(",", $address);
+	if (strstr($address, ',')){
+		$addressArray = explode(',', $address);
 		$address = $addressArray[0];
 	} // END - if
 
@@ -3359,88 +3128,28 @@ function determineRealRemoteAddress () {
 	return $address;
 }
 
-// "Getter" for remote IP number
-function GET_REMOTE_ADDR () {
-	// Get remote ip from environment
-	$remoteAddr = determineRealRemoteAddress();
-
-	// Is removeip installed?
-	if (EXT_IS_ACTIVE('removeip')) {
-		// Then anonymize it
-		$remoteAddr = GET_ANONYMOUS_REMOTE_ADDR($remoteAddr);
-	} // END - if
-
-	// Return it
-	return $remoteAddr;
-}
-
-// "Getter" for remote hostname
-function GET_REMOTE_HOST () {
-	// Get remote ip from environment
-	$remoteHost = getenv('REMOTE_HOST');
-
-	// Is removeip installed?
-	if (EXT_IS_ACTIVE('removeip')) {
-		// Then anonymize it
-		$remoteHost = GET_ANONYMOUS_REMOTE_HOST($remoteHost);
-	} // END - if
-
-	// Return it
-	return $remoteHost;
-}
-
-// "Getter" for user agent
-function GET_USER_AGENT () {
-	// Get remote ip from environment
-	$userAgent = getenv('HTTP_USER_AGENT');
-
-	// Is removeip installed?
-	if (EXT_IS_ACTIVE('removeip')) {
-		// Then anonymize it
-		$userAgent = GET_ANONYMOUS_USER_AGENT($userAgent);
-	} // END - if
-
-	// Return it
-	return $userAgent;
-}
-
-// "Getter" for referer
-function GET_REFERER () {
-	// Get remote ip from environment
-	$referer = getenv('HTTP_REFERER');
-
-	// Is removeip installed?
-	if (EXT_IS_ACTIVE('removeip')) {
-		// Then anonymize it
-		$referer = GET_ANONYMOUS_REFERER($referer);
-	} // END - if
-
-	// Return it
-	return $referer;
-}
-
 // Adds a bonus mail to the queue
 // This is a high-level function!
-function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
+function addNewBonusMail ($data, $mode = '', $output=true) {
 	// Use mode from data if not set and availble ;-)
 	if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode'];
 
 	// Generate receiver list
-	$RECEIVER = GENERATE_RECEIVER_LIST($data['cat'], $data['receiver'], $mode);
+	$RECEIVER = generateReceiverList($data['cat'], $data['receiver'], $mode);
 
 	// Receivers added?
 	if (!empty($RECEIVER)) {
 		// Add bonus mail to queue
-		ADD_BONUS_MAIL_TO_QUEUE(
-			$data['subject'],
-			$data['text'],
-			$RECEIVER,
-			$data['points'],
-			$data['seconds'],
-			$data['url'],
-			$data['cat'],
-			$mode,
-			$data['receiver']
+		addBonusMailToQueue(
+		$data['subject'],
+		$data['text'],
+		$RECEIVER,
+		$data['points'],
+		$data['seconds'],
+		$data['url'],
+		$data['cat'],
+		$mode,
+		$data['receiver']
 		);
 
 		// Mail inserted into bonus pool
@@ -3469,47 +3178,30 @@ function DETERMINE_REFID () {
 	} elseif (!empty($_GET['ref'])) {
 		// Set refid=ref (the referal link uses such variable)
 		$GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['ref']));
-	} elseif ((isSessionVariableSet('refid')) && (get_session('refid') != 0)) {
+	} elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
 		// Set session refid als global
-		$GLOBALS['refid'] = bigintval(get_session('refid'));
-	} elseif ((GET_EXT_VERSION('sql_patches') != "") && (getConfig('def_refid') > 0)) {
+		$GLOBALS['refid'] = bigintval(getSession('refid'));
+	} 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') {
 		// Select a random user which has confirmed enougth mails
-		$GLOBALS['refid'] = SELECT_RANDOM_REFID();
+		$GLOBALS['refid'] = determineRandomReferalId();
 	} else {
 		// No default ID when sql_patches is not installed or none set
 		$GLOBALS['refid'] = 0;
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((get_session('refid') == "0") && (getConfig('def_refid') > 0))) {
+	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (getConfig('def_refid') > 0))) {
 		// Set cookie
-		set_session('refid', $GLOBALS['refid']);
+		setSession('refid', $GLOBALS['refid']);
 	} // END - if
 
 	// Return determined refid
 	return $GLOBALS['refid'];
 }
 
-// Check wether we are installing
-function isInstalling () {
-	$installing = ((isset($GLOBALS['mxchange_installing'])) || (REQUEST_ISSET_GET('installing')));
-	//* DEBUG: */ var_dump($installing);
-	return $installing;
-}
-
-// Check wether this script is installed
-function isInstalled () {
-	return isBooleanConstantAndTrue('mxchange_installed');
-}
-
-// Check wether an admin is registered
-function isAdminRegistered () {
-	return isBooleanConstantAndTrue('admin_registered');
-}
-
 // Enables the reset mode. Only call this function if you really want the
 // reset to be run!
 function enableResetMode () {
@@ -3520,23 +3212,6 @@ function enableResetMode () {
 	runFilterChain('reset_enabled');
 }
 
-// Checks wether the reset mode is active
-function isResetModeEnabled () {
-	// Now simply check it
-	return ((isset($GLOBALS['reset_enabled'])) && ($GLOBALS['reset_enabled'] === true));
-}
-
-// Checks wether the debug mode is enabled
-function isDebugModeEnabled () {
-	// Simply check it
-	return isBooleanConstantAndTrue('DEBUG_MODE');
-}
-
-// Checks wether the cache instance is valid
-function isCacheInstanceValid () {
-	return ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])));
-}
-
 // Our shutdown-function
 function shutdown () {
 	// Call the filter chain 'shutdown'
@@ -3579,33 +3254,43 @@ function isUserIdSet () {
 	return (isset($GLOBALS['userid']));
 }
 
-// Checks wether the given FQFN is a directory and not .,.. or .svn
-function isDirectory ($FQFN) {
-	// Generate baseName
-	$baseName = basename($FQFN);
-
-	// Check it
-	$isDirectory = ((is_dir($FQFN)) && ($baseName != ".") && ($baseName != "..") && ($baseName != ".svn"));
-
-	// Return the result
-	return $isDirectory;
-}
-
 // Handle message codes from URL
 function handleCodeMessage () {
-	if (REQUEST_ISSET_GET(('msg'))) {
+	if (REQUEST_ISSET_GET('msg')) {
 		// Default extension is "unknown"
-		$ext = "unknown";
+		$ext = 'unknown';
 
 		// Is extension given?
-		if (REQUEST_ISSET_GET(('ext'))) $ext = REQUEST_GET(('ext'));
+		if (REQUEST_ISSET_GET('ext')) $ext = REQUEST_GET('ext');
 
 		// Convert the 'msg' parameter from URL to a human-readable message
 		$msg = convertCodeToMessage(REQUEST_GET('msg'));
 
 		// Load message template
-		LOAD_TEMPLATE("message", false, $msg);
+		LOAD_TEMPLATE('message', false, $msg);
+	} // END - if
+}
+
+// Setter for extra title
+function setExtraTitle ($extraTitle) {
+	$GLOBALS['extra_title'] = $extraTitle;
+}
+
+// Getter for extra title
+function getExtraTitle () {
+	// Is the extra title set?
+	if (!isExtraTitleSet()) {
+		// No, then abort here
+		debug_report_bug('extra_title is not set!');
 	} // END - if
+
+	// Return it
+	return $GLOBALS['extra_title'];
+}
+
+// Checks if the extra title is set
+function isExtraTitleSet () {
+	return ((isset($GLOBALS['extra_title'])) && (!empty($GLOBALS['extra_title'])));
 }
 
 //////////////////////////////////////////////////