X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=a1d9b344f625bbcb0694f77ce52c51c4464ce4df;hp=e9eb6681020ff46b822479f1b51822ea084c3321;hb=8454545089b9b77695498cd855cf50075151d957;hpb=a4fc56f660a422a080ff241bd86b772a5b5d0c53

diff --git a/inc/functions.php b/inc/functions.php
index e9eb668102..a1d9b344f6 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Check if our config file is writeable or not
-function is_INCWritable($inc) {
+function IS_INC_WRITEABLE($inc) {
 	// Generate FQFN
 	$fqfn = sprintf("%sinc/%s.php", PATH, $inc);
 
@@ -132,7 +132,8 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 
 		default:
 			// Huh, something goes wrong or maybe you have edited config.php ???
-			die ("<STRONG>".FATAL_ERROR.":</STRONG> ".LANG_NO_RENDER_DIRECT);
+			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE));
+			MXCHANGE_DIE("<STRONG>".FATAL_ERROR.":</STRONG> ".LANG_NO_RENDER_DIRECT);
 			break;
 		}
 	} elseif ((_OB_CACHING == "on") && ($footer == 1)) {
@@ -142,6 +143,19 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 		// Clear output buffer for later output
 		ob_end_clean();
 
+		// Send HTTP header
+		header("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");
+
 		// Extension "rewrite" installed?
 		if ((EXT_IS_ACTIVE("rewrite")) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
 			$OUTPUT = REWRITE_LINKS($OUTPUT);
@@ -207,7 +221,7 @@ function ADD_FATAL ($message, $extra="") {
 	}
 
 	// Log fatal messages away
-	DEBUG_LOG(__FUNCTION__."(".__LINE__."): message={$message}");
+	DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}");
 }
 
 // Load a template file and return it's content (only it's name; do not use ' or ")
@@ -219,23 +233,31 @@ function LOAD_TEMPLATE($template, $return=false, $content=array()) {
 	$template = strtolower($template);
 
 	// Count the template load
-	if (!isset($_CONFIG['num_templates'])) $_CONFIG['num_templates'] = 0;
-	$_CONFIG['num_templates']++;
+	if (getConfig('num_templates') == null) {
+		$_CONFIG['num_templates'] = 1;
+	} else {
+		$_CONFIG['num_templates']++;
+	}
+
+	// Prepare IP number and User Agent
+	$REMOTE_ADDR     = GET_REMOTE_ADDR();
+	if (!defined('REMOTE_ADDR')) define('REMOTE_ADDR', $REMOTE_ADDR);
+	$HTTP_USER_AGENT = GET_USER_AGENT();
 
 	// Init some data
 	$ret = "";
 	if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
 
-	// @DEPRECATED Try to remove this if() block
+	// @DEPRECATED Try to rewrite the if() condition
 	if ($template == "member_support_form") {
 		// Support request of a member
-		$result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-		 array($GLOBALS['userid']), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+			array($GLOBALS['userid']), __FILE__, __LINE__);
 
 		// Is content an array?
 		if (is_array($content)) {
 			// Merge data
-			$content = array_merge($content, SQL_FETCHARRAY($result));
+			$content = merge_array($content, SQL_FETCHARRAY($result));
 
 			// Translate gender
 			$content['gender'] = TRANSLATE_GENDER($content['gender']);
@@ -245,6 +267,7 @@ function LOAD_TEMPLATE($template, $return=false, $content=array()) {
 
 			// Translate gender
 			$gender = TRANSLATE_GENDER($gender);
+			DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("DEPRECATION-WARNING: content is not array (%s).", gettype($content)));
 		}
 
 		// Free result
@@ -382,7 +405,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
 			return;
 		} else {
 			// Load email address
-			$result_email = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
+			$result_email = SQL_QUERY_ESC("SELECT email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email)."<br />\n";
 
 			// Does the user exist?
@@ -443,7 +466,7 @@ Message : ".$MSG."
 </pre>\n";
 
 		// Log the mail away
-		if (defined('DEBUG_MAIL')) DEBUG_LOG(__FUNCTION__.":to={$TO},subject={$SUBJECT},msg={$MSG}");
+		if (defined('DEBUG_MAIL')) DEBUG_LOG(__FUNCTION__, __LINE__, "to={$TO},subject={$SUBJECT},msg={$MSG}");
 	} elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) {
 		// Send mail as HTML away
 		SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
@@ -512,7 +535,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
 // Generate a password in a specified length or use default password length
 function GEN_PASS($LEN = 0) {
 	global $_CONFIG;
-	if ($LEN == 0) $LEN = $_CONFIG['pass_len'];
+	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,-,+,_,/");
@@ -524,13 +547,13 @@ function GEN_PASS($LEN = 0) {
 	$PASS = "";
 	for ($i = 0; $i < $LEN; $i++) {
 		$PASS .= $ABC[mt_rand(0, sizeof($ABC) -1)];
-	}
+	} // END - for
 
 	// When the size is below 40 we can also add additional security by scrambling it
 	if (strlen($PASS) <= 40) {
 		// Also scramble the password
 		$PASS = scrambleString($PASS);
-	}
+	} // END - if
 
 	// Return the password
 	return $PASS;
@@ -554,6 +577,9 @@ function MAKE_DATETIME ($time, $mode="0")
 			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;
 
@@ -563,37 +589,39 @@ function MAKE_DATETIME ($time, $mode="0")
 			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 the american decimal dot into a german comma
-function TRANSLATE_COMMA ($dotted, $cut=true) {
+function TRANSLATE_COMMA ($dotted, $cut=true, $max=0) {
 	global $_CONFIG;
 
 	// Default is 3 you can change this in admin area "Misc -> Misc Options"
-	if (empty($_CONFIG['max_comma'])) $_CONFIG['max_comma'] = "3";
-	$maxComma = $_CONFIG['max_comma'];
+	if (getConfig('max_comma') == null) $_CONFIG['max_comma'] = "3";
+
+	// Use from config is default
+	$maxComma = getConfig('max_comma');
+
+	// Use from parameter?
+	if ($max > 0) $maxComma = $max;
 
 	// Cut zeros off?
-	if ($cut) {
+	if (($cut) && ($max == 0)) {
 		// Test for commata if in cut-mode
 		$com = explode(".", $dotted);
-		if (count($com) > 1) {
-			// Commata found, so only zeros?
-			if ($com[1] == str_repeat("0", strlen($com[1]))) {
-				// Only zeros, so display only one
-				$maxComma = 1;
-			} // END - if
-		} else {
+		if (count($com) < 2) {
 			// Don't display commatas even if there are none... ;-)
 			$maxComma = 0;
 		}
 	} // END - if
 
 	// Debug log
-	//DEBUG_LOG(__FUNCTION__.":dotted={$dotted},maxComma={$maxComma}");
+	//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "dotted={$dotted},maxComma={$maxComma}");
 
 	// Translate it now
 	switch (GET_LANGUAGE()) {
@@ -678,6 +706,7 @@ function TRANSLATE_STATUS($status) {
 		break;
 
 	default:
+		DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown status %s detected.", $status));
 		$ret = UNKNOWN_STATUS_1.$status.UNKNOWN_STATUS_2;
 		break;
 	}
@@ -685,19 +714,22 @@ function TRANSLATE_STATUS($status) {
 }
 //
 function GET_LANGUAGE() {
-	if (!empty($_GET['mx_lang'])) {
-		// Accept only first 2 chars
-		$lang = substr($_GET['mx_lang'], 0, 2);
-	} else {
-		// Do nothing
-		$lang = "";
-	}
+	global $cacheArray;
 
 	// Set default return value to default language from config
 	$ret = DEFAULT_LANG;
 
-	// Check GET variable and cookie
-	if (!empty($lang)) {
+	// Init variable
+	$lang = "";
+
+	// Is the variable set
+	if (!empty($_GET['mx_lang'])) {
+		// Accept only first 2 chars
+		$lang = substr($_GET['mx_lang'], 0, 2);
+	} elseif (isset($cacheArray['language'])) {
+		// Use cached
+		$ret = $cacheArray['language'];
+	} elseif (!empty($lang)) {
 		// Check if main language file does exist
 		if (FILE_READABLE(PATH."inc/language/".$lang.".php")) {
 			// Okay found, so let's update cookies
@@ -710,6 +742,11 @@ function GET_LANGUAGE() {
 		// Fixes a warning before the session has the mx_lang constant
 		if (empty($ret)) $ret = DEFAULT_LANG;
 	}
+
+	// Cache entry
+	$cacheArray['language'] = $ret;
+
+	// Return value
 	return $ret;
 }
 //
@@ -744,23 +781,26 @@ 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();
+
 		// Load Admin data
-		$ADMIN = GET_ADMIN_EMAIL(get_session('admin_login'));
+		$ADMIN = GET_ADMIN_EMAIL($aid);
 	} // END - if
 
 	// Neutral email address is default
 	$email = WEBMASTER;
 
 	// Expiration in a nice output format
-	if ($_CONFIG['auto_purge'] == 0) {
+	if (getConfig('auto_purge') == 0) {
 		// Will never expire!
 		$EXPIRATION = MAIL_WILL_NEVER_EXPIRE;
 	} elseif (function_exists('CREATE_FANCY_TIME')) {
 		// Create nice date string
-		$EXPIRATION = CREATE_FANCY_TIME($_CONFIG['auto_purge']);
+		$EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge'));
 	} else {
 		// Display days only
-		$EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS;
+		$EXPIRATION = round(getConfig('auto_purge')/60/60/24)." "._DAYS;
 	}
 
 	// Is content an array?
@@ -770,28 +810,25 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
 	} // END - if
 
 	// Load user's data
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template}<br />\n";
-	if ($UID > 0) {
+	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content)."<br />\n";
+	if (($UID > 0) && (is_array($content))) {
+		// If nickname extension is installed, fetch nickname as well
 		if (EXT_IS_ACTIVE("nickname")) {
 			//* 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",
+			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 				array(bigintval($UID)), __FILE__, __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",
+			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 				array(bigintval($UID)), __FILE__, __LINE__);
 		}
 
-		// Is content an array?
-		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):content[]=".gettype($content)."<br />\n";
-		if (is_array($content)) {
-			// Fetch and migrate data
-			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):content()=".count($content)." - PRE<br />\n";
-			$content = array_merge($content, SQL_FETCHARRAY($result));
-			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):content()=".count($content)." - AFTER<br />\n";
-		} // END - if
+		// Fetch and merge data
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):content()=".count($content)." - PRE<br />\n";
+		$content = merge_array($content, SQL_FETCHARRAY($result));
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):content()=".count($content)." - AFTER<br />\n";
 
 		// Free result
 		SQL_FREERESULT($result);
@@ -801,7 +838,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
 	if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']);
 
 	// Overwrite email from data if present
-	if (isset($content['email']))  $email = $content['email'];
+	if (isset($content['email'])) $email = $content['email'];
 
 	// Store email for some functions in global data array
 	$DATA['email'] = $email;
@@ -891,15 +928,15 @@ function MAKE_TIME($H, $M, $S, $stamp) {
 function LOAD_URL($URL, $addUrlData=true) {
 	global $CSS, $_CONFIG, $footer;
 
+	// Compile out URI codes
+	$URL = COMPILE_CODE($URL);
+
 	// Check if http(s):// is there
 	if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
 		// Make all URLs full-qualified
 		$URL = URL."/".$URL;
 	}
 
-	// Compile out URI codes
-	$URL = COMPILE_CODE($URL);
-
 	// Get output buffer
 	$OUTPUT = ob_get_contents();
 
@@ -1070,76 +1107,86 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 	$array = $dummy;
 }
 //
-function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
-{
-	global $MONTH_DESCR; $OUT = "";
-	if ($type == "yn")
-	{
+function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
+	global $MONTH_DESCR, $_CONFIG;
+	$OUT = "";
+
+	if ($type == "yn") {
 		// This is a yes/no selection only!
 		if ($id > 0) $prefix .= "[".$id."]";
 		$OUT .= "    <SELECT name=\"".$prefix."\" class=\"register_select\" size=\"1\">\n";
-	}
-	 else
-	{
+	} else {
 		// Begin with regular selection box here
 		if (!empty($prefix)) $prefix .= "_";
 		$type2 = $type;
 		if ($id > 0) $type2 .= "[".$id."]";
 		$OUT .= "    <SELECT name=\"".strtolower($prefix.$type2)."\" class=\"register_select\" size=\"1\">\n";
 	}
-	switch ($type)
-	{
+
+	switch ($type) {
 	case "day": // Day
-		for ($idx = 1; $idx < 32; $idx++)
-		{
+		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 ($MONTH_DESCR as $month => $descr)
-		{
+		foreach ($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());
 
+		// 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;
+
 		// Check if the default value is larger than minimum and bigger than actual year
-		if (($DEFAULT > 1930) && ($DEFAULT >= $YEAR))
-		{
-			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++)
-			{
+		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";
-			}
-		}
-		 elseif ($DEFAULT == -1)
-		{
+			} // END - for
+		} elseif ($DEFAULT == -1) {
 			// Current year minus 1
-			for ($idx = 2003; $idx <= ($YEAR + 1); $idx++)
+			for ($idx = $startYear; $idx <= ($YEAR + 1); $idx++)
 			{
 				$OUT .= "<OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
 			}
-		}
-		 else
-		{
-			// Get current year and subtract 16 (for erotic content)
-			$OUT .= "<OPTION value=\"1929\">&lt;1930</OPTION>\n";
-			$YEAR = date('Y', time()) - 16;
-			for ($idx = 1930; $idx <= $YEAR; $idx++)
-			{
+		} 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;
+			}
+
+			// 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;
 
@@ -1150,7 +1197,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
-		}
+		} // END - for
 		break;
 
 	case "hour":
@@ -1159,7 +1206,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
-		}
+		} // END - for
 		break;
 
 	case "yn":
@@ -1178,8 +1225,8 @@ function TRANSLATE_YESNO($yn)
 {
 	switch ($yn)
 	{
-		case 'Y': $yn = YES; break;
-		case 'N': $yn = NO; break;
+		case "Y": $yn = YES; break;
+		case "N": $yn = NO; break;
 		default : $yn = "??? (".$yn.")"; break;
 	}
 	return $yn;
@@ -1199,10 +1246,10 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
 
 	// Build key string
 	$keys   = SITE_KEY.":".DATE_KEY;
-	if (isset($_CONFIG['secret_key']))  $keys .= ":".$_CONFIG['secret_key'];
-	if (isset($_CONFIG['file_hash']))   $keys .= ":".$_CONFIG['file_hash'];
-	$keys .= ":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime']));
-	if (isset($_CONFIG['master_salt'])) $keys .= ":".$_CONFIG['master_salt'];
+	if (getConfig('secret_key') != null)  $keys .= ":".getConfig('secret_key');
+	if (getConfig('file_hash') != null)   $keys .= ":".getConfig('file_hash');
+	$keys .= ":".date("d-m-Y (l-F-T)", bigintval(getConfig('patch_ctime')));
+	if (getConfig('master_salt') != null) $keys .= ":".getConfig('master_salt');
 
 	// Build string from misc data
 	$data   = $code.":".$uid.":".$DATA;
@@ -1218,12 +1265,12 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
 	// Calculate number for generating the code
 	$a = $code + _ADD - 1;
 
-	if (isset($_CONFIG['master_hash'])) {
+	if (getConfig('master_hash') != null) {
 		// Generate hash with master salt from modula of number with the prime number and other data
-		$saltedHash = generateHash(($a % _PRIME).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, $_CONFIG['master_salt']);
+		$saltedHash = generateHash(($a % _PRIME).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, getConfig('master_salt'));
 
 		// Create number from hash
-		$rcode = hexdec(substr($saltedHash, strlen($_CONFIG['master_salt']), 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
+		$rcode = hexdec(substr($saltedHash, strlen(getConfig('master_salt')), 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
 	} else {
 		// Generate hash with "hash of site key" from modula of number with the prime number and other data
 		$saltedHash = generateHash(($a % _PRIME).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, substr(sha1(SITE_KEY), 0, 8));
@@ -1233,7 +1280,7 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
 	}
 
 	// At least 10 numbers shall be secure enought!
-	$len = $_CONFIG['code_length'];
+	$len = getConfig('code_length');
 	if ($len == 0) $len = $length;
 	if ($len == 0) $len = 10;
 
@@ -1254,7 +1301,10 @@ function bigintval($num, $castValue = true) {
 	// Has the whole value changed?
 	if ("".$ret."" != "".$num."") {
 		// Log the values
-		DEBUG_LOG(__FUNCTION__.": num={$num},ret={$ret}");
+		print("<pre>");
+		debug_print_backtrace();
+		die("</pre>");
+		DEBUG_LOG(__FUNCTION__, __LINE__, " num={$num},ret={$ret}");
 	} // END - if
 
 	// Return result
@@ -1264,7 +1314,7 @@ function bigintval($num, $castValue = true) {
 function GENERATE_IMAGE($img_code, $header=true) {
 	global $_CONFIG;
 
-	if ((strlen($img_code) > 6) || (empty($img_code)) || ($_CONFIG['code_length'] == 0)) {
+	if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == 0)) {
 		// Stop execution of function here because of over-sized code length
 		return;
 	} elseif (!$header) {
@@ -1273,10 +1323,10 @@ function GENERATE_IMAGE($img_code, $header=true) {
 	}
 
 	// Load image
-	$img = sprintf("%s/theme/%s/images/code_bg.%s", PATH, GET_CURR_THEME(), $_CONFIG['img_type']);
+	$img = sprintf("%s/theme/%s/images/code_bg.%s", PATH, GET_CURR_THEME(), getConfig('img_type'));
 	if (FILE_READABLE($img)) {
 		// Switch image type
-		switch ($_CONFIG['img_type'])
+		switch (getConfig('img_type'))
 		{
 		case "jpg":
 			// Okay, load image and hide all errors
@@ -1300,10 +1350,10 @@ function GENERATE_IMAGE($img_code, $header=true) {
 	imagestring($image, 5, 14, 2, $img_code, $text_color);
 
 	// Return to browser
-	header ("Content-Type: image/".$_CONFIG['img_type']);
+	header ("Content-Type: image/".getConfig('img_type'));
 
 	// Output image with matching image factory
-	switch ($_CONFIG['img_type']) {
+	switch (getConfig('img_type')) {
 		case "jpg": imagejpeg($image); break;
 		case "png": imagepng($image);  break;
 	}
@@ -1312,38 +1362,46 @@ function GENERATE_IMAGE($img_code, $header=true) {
 	imagedestroy($image);
 }
 // Create selection box or array of splitted timestamp
-function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
+function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
 	global $_CONFIG;
 
 	// Calculate 2-seconds timestamp
 	$stamp = round($timestamp);
+	//* 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() + $stamp));
+	$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 = $_CONFIG['one_day'];
+	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($M2 > "02"))  $SWITCH = getConfig('one_day');
 
 	// First of all years...
-	$Y = abs(floor($stamp / (31536000 + $SWITCH)));
+	$Y = abs(floor($timestamp / (31536000 + $SWITCH)));
+	//* DEBUG: */ print("Y={$Y}<br />\n");
 	// Next months...
-	$M = abs(floor($stamp / 2628000 - $Y * 12));
+	$M = abs(floor($timestamp / 2628000 - $Y * 12));
+	//* DEBUG: */ print("M={$M}<br />\n");
 	// Next weeks
-	$W = abs(floor($stamp / 604800 - $Y * ((365 + $SWITCH / $_CONFIG['one_day']) / 7) - ($M / 12 * (365 + $SWITCH / $_CONFIG['one_day']) / 7)));
+	$W = abs(floor($timestamp / 604800 - $Y * ((365 + $SWITCH / getConfig('one_day')) / 7) - ($M / 12 * (365 + $SWITCH / getConfig('one_day')) / 7)));
+	//* DEBUG: */ print("W={$W}<br />\n");
 	// Next days...
-	$D = abs(floor($stamp / 86400 - $Y * (365 + $SWITCH / $_CONFIG['one_day']) - ($M / 12 * (365 + $SWITCH / $_CONFIG['one_day'])) - $W * 7));
+	$D = abs(floor($timestamp / 86400 - $Y * (365 + $SWITCH / getConfig('one_day')) - ($M / 12 * (365 + $SWITCH / getConfig('one_day'))) - $W * 7));
+	//* DEBUG: */ print("D={$D}<br />\n");
 	// Next hours...
-	$h = abs(floor($stamp / 3600 - $Y * (365 + $SWITCH / $_CONFIG['one_day']) * 24 - ($M / 12 * (365 + $SWITCH / $_CONFIG['one_day']) * 24) - $W * 7 * 24 - $D * 24));
+	$h = abs(floor($timestamp / 3600 - $Y * (365 + $SWITCH / getConfig('one_day')) * 24 - ($M / 12 * (365 + $SWITCH / getConfig('one_day')) * 24) - $W * 7 * 24 - $D * 24));
+	//* DEBUG: */ print("h={$h}<br />\n");
 	// Next minutes..
-	$m = abs(floor($stamp / 60 - $Y * (365 + $SWITCH / $_CONFIG['one_day']) * 24 * 60 - ($M / 12 * (365 + $SWITCH / $_CONFIG['one_day']) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
+	$m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / getConfig('one_day')) * 24 * 60 - ($M / 12 * (365 + $SWITCH / getConfig('one_day')) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
+	//* DEBUG: */ print("m={$m}<br />\n");
 	// And at last seconds...
-	$s = abs(floor($stamp - $Y * (365 + $SWITCH / $_CONFIG['one_day']) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / $_CONFIG['one_day']) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+	$s = abs(floor($timestamp - $Y * (365 + $SWITCH / getConfig('one_day')) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / getConfig('one_day')) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+	//* DEBUG: */ print("s={$s}<br />\n");
 
 	// Is seconds zero and time is < 60 seconds?
-	if (($s == 0) && ($stamp < 60)) {
+	if (($s == 0) && ($timestamp < 60)) {
 		// Fix seconds
 		$s = round($timestamp);
 	} // END - if
@@ -1481,7 +1539,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 		if (ereg("s", $display) || (empty($display))) {
 			// Generate second selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 45; $idx += 15) {
+			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $s) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
@@ -1507,7 +1565,7 @@ function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
 	$TEST = date('Y', time()) / 4;
 	$M1   = date("m", time());
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
-	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($POST[$prefix."_mo"] > "02"))  $SWITCH = $_CONFIG['one_day'];
+	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($POST[$prefix."_mo"] > "02"))  $SWITCH = getConfig('one_day');
 	// First add years...
 	$ret += $POST[$prefix."_ye"] * (31536000 + $SWITCH);
 	// Next months...
@@ -1580,7 +1638,7 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
 	SQL_FREERESULT($result);
 }
 //
-function CREATE_FANCY_TIME($stamp) {
+function CREATE_FANCY_TIME ($stamp) {
 	// Get data array with years/months/weeks/days/...
 	$data = CREATE_TIME_SELECTIONS($stamp, "", "", "", true);
 	$ret = "";
@@ -1726,6 +1784,7 @@ function POST_URL ($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("", "", "");
 	} // END - if
 
@@ -1767,7 +1826,7 @@ function SEND_RAW_REQUEST ($host, $request) {
 	$useProxy = false;
 
 	// Are proxy settins set?
-	if ((!empty($_CONFIG['proxy_host'])) && ($_CONFIG['proxy_port'] > 0)) {
+	if ((getConfig('proxy_host') != "") && (getConfig('proxy_port') > 0)) {
 		// Then use it
 		$useProxy = true;
 	} // END - if
@@ -1775,7 +1834,7 @@ function SEND_RAW_REQUEST ($host, $request) {
 	// Open connection
 	//* DEBUG: */ die("SCRIPT=".$script."<br />\n");
 	if ($useProxy) {
-		$fp = @fsockopen(COMPILE_CODE($_CONFIG['proxy_host']), $_CONFIG['proxy_port'], $errno, $errdesc, 30);
+		$fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), getConfig('proxy_port'), $errno, $errdesc, 30);
 	} else {
 		$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
 	}
@@ -1793,9 +1852,9 @@ function SEND_RAW_REQUEST ($host, $request) {
 		$proxyTunnel .= "Host: ".$host."\r\n";
 
 		// Use login data to proxy? (username at least!)
-		if (!empty($_CONFIG['proxy_username'])) {
+		if (getConfig('proxy_username') != "") {
 			// Add it as well
-			$encodedAuth = base64_encode(COMPILE_CODE($_CONFIG['proxy_username']).":".COMPILE_CODE($_CONFIG['proxy_password']));
+			$encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')).":".COMPILE_CODE(getConfig('proxy_password')));
 			$proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
 		} // END - if
 
@@ -1945,7 +2004,7 @@ function ADD_CATEGORY_TABLE ($MODE, $return=false) {
 	return REGISTER_ADD_CATEGORY_TABLE ($MODE, $return);
 }
 // Generate an email link
-function CREATE_EMAIL_LINK($email, $table="admins") {
+function CREATE_EMAIL_LINK ($email, $table = "admins") {
 	// Default email link (INSECURE! Spammer can read this by harvester programs)
 	$EMAIL = "mailto:".$email;
 
@@ -1973,12 +2032,12 @@ 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 return the plain text
-		return $plainText;
+		// Extension sql_patches is missing/outdated so we hash the plain text with MD5
+		return md5($plainText);
 	} // END - if
 
 	// Do we miss an arry element here?
-	if (!isset($_CONFIG['file_hash'])) {
+	if (getConfig('file_hash') == null) {
 		// Stop here
 		print("Missing file_hash in ".__FUNCTION__.". Backtrace:<pre>");
 		debug_print_backtrace();
@@ -1991,10 +2050,10 @@ function generateHash ($plainText, $salt = "") {
 		$server = $_SERVER['PHP_SELF'].":".GET_USER_AGENT().":".getenv('SERVER_SOFTWARE').":".GET_REMOTE_ADDR().":".":".filemtime(PATH."inc/databases.php");
 
 		// Build key string
-		$keys   = SITE_KEY.":".DATE_KEY.":".$_CONFIG['secret_key'].":".$_CONFIG['file_hash'].":".date("d-m-Y (l-F-T)", bigintval($_CONFIG['patch_ctime'])).":".$_CONFIG['master_salt'];
+		$keys   = SITE_KEY.":".DATE_KEY.":".getConfig('secret_key').":".getConfig('file_hash').":".date("d-m-Y (l-F-T)", bigintval(getConfig('patch_ctime'))).":".getConfig('master_salt');
 
 		// Additional data
-		$data = $plainText.":".uniqid(rand(), true).":".time();
+		$data = $plainText.":".uniqid(mt_rand(), true).":".time();
 
 		// Calculate number for generating the code
 		$a = time() + _ADD - 1;
@@ -2008,11 +2067,11 @@ function generateHash ($plainText, $salt = "") {
 		//* DEBUG: */ echo "Descrambled=".$sha1b." (".strlen($sha1b).")<br />";
 
 		// Generate the password salt string
-		$salt = substr($sha1, 0, $_CONFIG['salt_length']);
+		$salt = substr($sha1, 0, getConfig('salt_length'));
 		//* DEBUG: */ echo $salt." (".strlen($salt).")<br />";
 	} else {
 		// Use given salt
-		$salt = substr($salt, 0, $_CONFIG['salt_length']);
+		$salt = substr($salt, 0, getConfig('salt_length'));
 		//* DEBUG: */ echo "GIVEN={$salt}<br />\n";
 	}
 
@@ -2032,7 +2091,7 @@ function scrambleString($str) {
 		return $str;
 	} elseif (strlen($str) == 40) {
 		// From database
-		$scrambleNums = explode(":", $_CONFIG['pass_scramble']);
+		$scrambleNums = explode(":", getConfig('pass_scramble'));
 	} else {
 		// Generate new numbers
 		$scrambleNums = explode(":", genScrambleString(strlen($str)));
@@ -2059,7 +2118,7 @@ function descrambleString($str) {
 	if (strlen($str) != 40) return $str;
 
 	// Load numbers from config
-	$scrambleNums = explode(":", $_CONFIG['pass_scramble']);
+	$scrambleNums = explode(":", getConfig('pass_scramble'));
 
 	// Validate numbers
 	if (count($scrambleNums) != 40) return $str;
@@ -2115,9 +2174,9 @@ function ADD_URL_DATA($URL) {
 		if ((!empty($_GET['refid'])) && (strpos($URL, "refid=") == 0)) {
 			// Cookie found in URL
 			$ADD .= $BIND."refid=".bigintval($_GET['refid']);
-		} elseif ((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['def_refid'] > 0)) {
+		} elseif ((GET_EXT_VERSION("sql_patches") != '') && (getConfig('def_refid') > 0)) {
 			// Not found! So let's set default here
-			$ADD .= $BIND."refid=".$_CONFIG['def_refid'];
+			$ADD .= $BIND."refid=".getConfig('def_refid');
 		}
 
 		// Is there already added data? Then change the binder
@@ -2144,12 +2203,12 @@ function generatePassString($passHash) {
 	$ret = $passHash;
 
 	// Is a secret key and master salt already initialized?
-	if ((!empty($_CONFIG['secret_key'])) && (!empty($_CONFIG['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++) {
 			$part1 = hexdec(substr($passHash, $start, 4));
-			$part2 = hexdec(substr($_CONFIG['secret_key'], $start, 4));
+			$part2 = hexdec(substr(getConfig('secret_key'), $start, 4));
 			$mod = dechex($idx);
 			if ($part1 > $part2) {
 				$mod = dechex(sqrt(($part1 - $part2) * _PRIME / pi()));
@@ -2164,7 +2223,7 @@ function generatePassString($passHash) {
 		} // END - for
 
 		//* DEBUG: */ print($passHash."<br />".$newHash." (".strlen($newHash).")");
-		$ret = generateHash($newHash, $_CONFIG['master_salt']);
+		$ret = generateHash($newHash, getConfig('master_salt'));
 		//* DEBUG: */ print($ret."<br />\n");
 	} else {
 		// Hash it simple
@@ -2207,14 +2266,16 @@ function mxchange_die ($msg) {
 
 // Display parsing time and number of SQL queries in footer
 function DISPLAY_PARSING_TIME_FOOTER() {
-	global $startTime, $_CONFIG;
-	$endTime = microtime(true);
+	global $_CONFIG;
 
 	// Is the timer started?
 	if (!isset($GLOBALS['startTime'])) {
 		// Abort here
 		return false;
-	}
+	} // END - if
+
+	// Get end time
+	$endTime = microtime(true);
 
 	// "Explode" both times
 	$start = explode(" ", $GLOBALS['startTime']);
@@ -2226,8 +2287,8 @@ function DISPLAY_PARSING_TIME_FOOTER() {
 	// Prepare output
 	$content = array(
 		'runtime' 		=> $runTime,
-		'numSQLs'		=> ($_CONFIG['sql_count'] + 1),
-		'numTemplates'	=> ($_CONFIG['num_templates'] + 1)
+		'numSQLs'		=> (getConfig('sql_count') + 1),
+		'numTemplates'	=> (getConfig('num_templates') + 1)
 	);
 
 	// Load the template
@@ -2270,23 +2331,23 @@ function set_session ($var, $value) {
 // Check wether a boolean constant is set
 // Taken from user comments in PHP documentation for function constant()
 function isBooleanConstantAndTrue($constName) { // : Boolean
-	global $constCache;
+	global $cacheArray;
 
 	// Failed by default
 	$res = false;
 
 	// In cache?
-	if (isset($constCache[$constName])) {
+	if (isset($cacheArray['const'][$constName])) {
 		// Use cache
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ".$constName."-CACHE!<br />\n";
-		$res = $constCache[$constName];
+		$res = $cacheArray['const'][$constName];
 	} else {
 		// Check constant
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ".$constName."-RESOLVE!<br />\n";
 		if (defined($constName)) $res = (constant($constName) === true);
 
 		// Set cache
-		$constCache[$constName] = $res;
+		$cacheArray['const'][$constName] = $res;
 	}
 	//* DEBUG: */ var_dump($res);
 
@@ -2295,12 +2356,12 @@ function isBooleanConstantAndTrue($constName) { // : Boolean
 }
 
 // Check wether a session variable is set
-function isSessionVariableSet($var) {
+function isSessionVariableSet ($var) {
 	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):var={$var}<br />\n";
 	return (isset($_SESSION[$var]));
 }
 // Returns wether the value of the session variable or NULL if not set
-function get_session($var) {
+function get_session ($var) {
 	global $cacheArray;
 
 	// Default is not found! ;-)
@@ -2309,9 +2370,11 @@ function get_session($var) {
 	// Is the variable there or cached values?
 	if (isset($cacheArray['session'][$var])) {
 		// Get cached value (skips a lot SQL_ESCAPE() calles!
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ".$var."-CACHE!<br />\n";
 		$value = $cacheArray['session'][$var];
 	} elseif (isSessionVariableSet($var)) {
 		// Then  get it secured!
+		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ".$var."-RESOLVE!<br />\n";
 		$value = SQL_ESCAPE($_SESSION[$var]);
 
 		// Cache the value
@@ -2354,12 +2417,12 @@ function merge_array ($array1, $array2) {
 	die("</pre>");
 }
 // Debug message logger
-function DEBUG_LOG ($message, $force=false) {
+function DEBUG_LOG ($file, $line, $message, $force=true) {
 	// Is debug mode enabled?
 	if ((isBooleanConstantAndTrue('DEBUG_MODE')) || ($force)) {
 		// Log this message away
 		$fp = fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!");
-		fwrite($fp, date("d.m.Y|H:i:s", time())."|".strip_tags($message)."\n");
+		fwrite($fp, date("d.m.Y|H:i:s", time())."|".basename($file)."|".$line."|".strip_tags($message)."\n");
 		fclose($fp);
 	} // END - if
 }
@@ -2425,9 +2488,9 @@ function RESET_ADD_INCLUDES () {
 	$currWeek = date("W", time());
 
 	// Has it changed?
-	if ($_CONFIG['last_week'] != $currWeek) {
+	if (getConfig('last_week') != $currWeek) {
 		// Include weekly reset scripts
-		$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/weekly/", "weekly_"));
+		$INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/weekly/", "weekly_"));
 
 		// Update config
 		if (!defined('DEBUG_WEEKLY')) UPDATE_CONFIG("last_week", $currWeek);
@@ -2437,9 +2500,9 @@ function RESET_ADD_INCLUDES () {
 	$currMonth = date("m", time());
 
 	// Has it changed?
-	if ($_CONFIG['last_month'] != $currMonth) {
+	if (getConfig('last_month') != $currMonth) {
 		// Include monthly reset scripts
-		$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/monthly/", "monthly_"));
+		$INC_POOL = merge_array($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/monthly/", "monthly_"));
 
 		// Update config
 		if (!defined('DEBUG_MONTHLY')) UPDATE_CONFIG("last_month", $currMonth);
@@ -2465,7 +2528,7 @@ function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
 				// If we have an array simply use it and pre-extend it with our value
 				if (is_array($extraValue)) {
 					// Make the new args array
-					$args = array_merge(array($value), $extraValue);
+					$args = merge_array(array($value), $extraValue);
 				} // END - if
 
 				// Call the multi-parameter call-back
@@ -2488,31 +2551,31 @@ function FILE_READABLE($fqfn) {
 // Converts timestamp selections into a timestamp
 function CONVERT_SELECTIONS_TO_TIMESTAMP(&$POST, &$DATA, &$id, &$skip) {
 	// Init test variable
-	$TEST2 = "";
+	$test2 = "";
 
 	// Get last three chars
-	$TEST = substr($id, -3);
+	$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)) {
+		$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)) {
 			// Generate timestamp
-			$POST[$TEST] = CREATE_TIMESTAMP_FROM_SELECTIONS($TEST, $POST);
-			$DATA[] = "$TEST='".$POST[$TEST]."'";
+			$POST[$test] = CREATE_TIMESTAMP_FROM_SELECTIONS($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]);
+				unset($POST[$test."_".$rem]);
 			} // END - foreach
 
 			// Skip adding
-			unset($id); $skip = true; $TEST2 = $TEST;
+			unset($id); $skip = true; $test2 = $test;
 		} // END - if
 	} else {
 		// Process this entry
-		$skip = false; $TEST2 = "";
+		$skip = false; $test2 = "";
 	}
 }
 // Reverts the german decimal comma into Computer decimal dot
@@ -2574,9 +2637,9 @@ function REBUILD_CACHE ($cache, $inc="") {
 	// Shall I remove the cache file?
 	if ((EXT_IS_ACTIVE("cache")) && (is_object($cacheInstance))) {
 		// Rebuild cache
-		if ($cacheInstance->cache_file($cache, true)) {
+		if ($cacheInstance->loadCacheFile($cache)) {
 			// Destroy it
-			$cacheInstance->cache_destroy();
+			$cacheInstance->destroyCacheFile();
 		} // END - if
 
 		// Include file given?
@@ -2587,17 +2650,18 @@ function REBUILD_CACHE ($cache, $inc="") {
 			// Is the include there?
 			if (FILE_READABLE($fqfn)) {
 				// And rebuild it from scratch
+				//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): inc={$inc} - LOADED!<br />\n";
 				require($fqfn);
 			} else {
 				// Include not found!
-				DEBUG_LOG(__FUNCTION__.":Include {$inc} not found. cache={$cache}");
+				DEBUG_LOG(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
 			}
 		} // END - if
 	} // END - if
 }
 // Purge admin menu cache
 function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
-	global $_CONFIG, $cacheInstance;
+	global $cacheInstance;
 
 	// Is the cache extension enabled or no cache instance or admin menu cache disabled?
 	if (!EXT_IS_ACTIVE("cache")) {
@@ -2605,9 +2669,9 @@ function CACHE_PURGE_ADMIN_MENU ($id=0, $action="", $what="", $str="") {
 		return false;
 	} elseif (!is_object($cacheInstance)) {
 		// No cache instance!
-		DEBUG_LOG(__FUNCTION__.": No cache instance found.");
+		DEBUG_LOG(__FUNCTION__, __LINE__, " No cache instance found.");
 		return false;
-	} elseif ((!isset($_CONFIG['cache_admin_menu'])) || ($_CONFIG['cache_admin_menu'] == "N")) {
+	} elseif ((getConfig('cache_admin_menu') == null) || (getConfig('cache_admin_menu') == "N")) {
 		// Caching disabled (currently experiemental!)
 		return false;
 	}
@@ -2720,9 +2784,89 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED);
 	} else {
 		// Debug log
-		DEBUG_LOG(__FUNCTION__."(".__LINE__."): cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
+		DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
 	}
 }
+// Determines referal id and sets it
+function DETERMINE_REFID () {
+	global $_CONFIG, $CLICK, $_SERVER;
+
+	// Check if refid is set
+	if ((!empty($_GET['user'])) && ($CLICK == 1) && (basename($_SERVER['PHP_SELF']) == "click.php")) {
+		// The variable user comes from the click-counter script click.php and we only accept this here
+		$GLOBALS['refid'] = bigintval($_GET['user']);
+	} elseif (!empty($_POST['refid'])) {
+		// Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
+		$GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_POST['refid']));
+	} elseif (!empty($_GET['refid'])) {
+		// Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
+		$GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['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)) {
+		// Set session refid als global
+		$GLOBALS['refid'] = bigintval(get_session('refid'));
+	} elseif ((GET_EXT_VERSION("sql_patches") != "") && (getConfig('def_refid') > 0)) {
+		// Set default refid as refid in URL
+		$GLOBALS['refid'] = bigintval(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();
+	} 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))) {
+		// Set cookie
+		set_session('refid', $GLOBALS['refid']);
+	} // END - if
+
+	// Return determined refid
+	return $GLOBALS['refid'];
+}
+
+// Destroys the admin session
+function DESTROY_ADMIN_SESSION ($destroy = true) {
+	// Kill maybe existing session variables including array elements
+	set_session('admin_login', "");
+	set_session('admin_md5'  , "");
+	set_session('admin_last' , "");
+	set_session('admin_to'   , "");
+
+	// Destroy session and return status
+	if ($destroy) {
+		return @session_destroy();
+	} // END - if
+
+	// All fine if we shall not really destroy the session
+	return true;
+}
+
+// Checks if a given apache module is loaded
+function IF_APACHE_MODULE_LOADED ($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 $_CONFIG entries
+function getConfig ($entry) {
+	global $_CONFIG;
+
+	// Default value
+	$value = null;
+
+	// Is the entry there?
+	if (isset($_CONFIG[$entry])) {
+		// Then use it
+		$value = $_CONFIG[$entry];
+	} // END - if
+
+	// Return it
+	return $value;
+}
 
 //////////////////////////////////////////////////
 //                                              //
@@ -2732,7 +2876,7 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
 //
 if (!function_exists('html_entity_decode')) {
 	// Taken from documentation on www.php.net
-	function html_entity_decode($string) {
+	function html_entity_decode ($string) {
 		$trans_tbl = get_html_translation_table(HTML_ENTITIES);
 		$trans_tbl = array_flip($trans_tbl);
 		return strtr($string, $trans_tbl);