X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=0bfa73075cb3eb8c3ec2584602d62f597008d900;hp=3cdabf7e3e09ff0c32816a90d0a133e6ad209b27;hb=ea2a5e6a7838127d2f9dec02ba68ec575188528b;hpb=0da26ebf67e1a6c8e5ab5f23639c6abd99d84b2d

diff --git a/inc/functions.php b/inc/functions.php
index 3cdabf7e3e..0bfa73075c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -33,7 +33,7 @@
 
 // Some security stuff...
 if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-	$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);
 }
 
@@ -138,8 +138,16 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 
 		// Compile and run finished rendered HTML code
 		while (strpos($OUTPUT, '{!') > 0) {
-			$eval = "\$OUTPUT = \"" . COMPILE_CODE(addslashes($OUTPUT)) . "\";";
-			eval($eval);
+			// Prepare the content and eval() it...
+			$newContent = "";
+			$eval = "\$newContent = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
+			@eval($eval);
+
+			if (empty($newContent)) {
+				// Something went wrong!
+				die("Evaluation error:<pre>".htmlentities($eval)."</pre>");
+			}
+			$OUTPUT = $newContent;
 		}
 
 		// Output code here, DO NOT REMOVE! ;-)
@@ -152,7 +160,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 
 		// Compile and run finished rendered HTML code
 		while (strpos($OUTPUT, '{!') > 0) {
-			$eval = "\$OUTPUT = \"" . COMPILE_CODE(addslashes($OUTPUT)) . "\";";
+			$eval = "\$OUTPUT = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
 			eval($eval);
 		}
 
@@ -163,16 +171,14 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 
 // Output the raw HTML code
 function OUTPUT_RAW ($HTML) {
-	if ((isBooleanConstantAndTrue('mxchange_installed')) && (basename($_SERVER['PHP_SELF']) != "install.php")) {
-		// Not in install-mode so strip slashes away
-		echo stripslashes($HTML);
-	} else {
-		// Output directly in install-mode
-		echo $HTML;
-	}
+	// Output stripped HTML code to avoid broken JavaScript code, etc.
+	echo stripslashes($HTML);
 
-	// Flush the output
-	flush();
+	// Flush the output if only _OB_CACHING is not "on"
+	if (_OB_CACHING != "on") {
+		// Flush it
+		flush();
+	}
 }
 
 // Add a fatal error message to the queue array
@@ -192,6 +198,9 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 	// Add more variables which you want to use in your template files
 	global $DATA, $_CONFIG, $username;
 
+	// Make all template names lowercase
+	$template = strtolower($template);
+
 	// Count the template load
 	if (!isset($_CONFIG['num_templates'])) $_CONFIG['num_templates'] = 0;
 	$_CONFIG['num_templates']++;
@@ -203,9 +212,10 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 	if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
 	$REFID = $GLOBALS['refid'];
 
+	// DEPRECATED!!!
 	if ($template == "member_support_form") {
 		// Support request of a member
-		$result = SQL_QUERY_ESC("SELECT sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
 		 array($GLOBALS['userid']), __FILE__, __LINE__);
 		list($sex, $surname, $family) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
@@ -216,7 +226,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 	$date_time = MAKE_DATETIME(time(), "1");
 
 	// Base directory
-	$BASE = PATH."templates/".GET_LANGUAGE()."/html/";
+	$BASE = sprintf("%stemplates/%s/html/", PATH, GET_LANGUAGE());
 	$MODE = "";
 
 	// Check for admin/guest/member templates
@@ -283,9 +293,10 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 		while (strpos($tmpl_file, "\'") !== false) { $tmpl_file = str_replace("\'", '{QUOT}', $tmpl_file); }
 
 		// Do we have to compile the code?
+		$ret = "";
 		if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) {
 			// Okay, compile it!
-			$tmpl_file = "\$ret=\"" . COMPILE_CODE(addslashes($tmpl_file)) . "\";";
+			$tmpl_file = "\$ret=\"".COMPILE_CODE(addslashes($tmpl_file))."\";";
 			eval($tmpl_file);
 		} else {
 			// Simply return loaded code
@@ -325,21 +336,24 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 // Send mail out to an email address
 function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") {
 	// Compile subject line (for POINTS constant etc.)
-	$eval = "\$SUBJECT = \"" . COMPILE_CODE(addslashes($SUBJECT)) . "\";";
+	$eval = "\$SUBJECT = \"".COMPILE_CODE(addslashes($SUBJECT))."\";";
 	eval($eval);
 	$SUBJECT = html_entity_decode($SUBJECT);
 
 	// Set from header
-	if (!eregi("@", $TO)) {
+	if ((!eregi("@", $TO)) && ($TO > 0)) {
 		// Value detected, load email from database
 		if (EXT_IS_ACTIVE("msg")) {
 			ADD_MESSAGE_TO_BOX($TO, $SUBJECT, $MSG, $HTML);
 			return;
 		} else {
-			$result_email = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d 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__);
 			list($TO) = SQL_FETCHROW($result_email);
 			SQL_FREERESULT($result_email);
 		}
+	} elseif ($TO == 0) {
+		// Is the webmaster!
+		$TO = WEBMASTER;
 	}
 
 	// Not in PHPMailer-Mode
@@ -362,7 +376,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") {
 	}
 
 	// Fix HTML parameter (default is no!)
-	if (empty($HTML)) $HTML = 'N';
+	if (empty($HTML)) $HTML = "N";
 	if (isBooleanConstantAndTrue('DEBUG_MODE')) {
 		// In debug mode we want to display the mail instead of sending it away so we can debug this part
 		echo "<PRE>
@@ -371,7 +385,7 @@ To      : ".$TO."
 Subject : ".$SUBJECT."
 Message : ".$MSG."
 </PRE>\n";
-	} elseif (($HTML == 'Y') && (EXT_IS_ACTIVE("html_mail", true))) {
+	} elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail", true))) {
 		// Send mail as HTML away
 		SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
 	} elseif (!empty($TO)) {
@@ -380,7 +394,7 @@ Message : ".$MSG."
 
 		// Send Mail away
 		SEND_RAW_EMAIL($TO, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM);
-	} elseif ($HTML == 'N') {
+	} elseif ($HTML == "N") {
 		// Problem found!
 		SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM);
 	}
@@ -404,7 +418,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
 
 		// get new instance
 		$mail = new PHPMailer();
-		$mail->PluginDir  = PATH."inc/phpmailer/";
+		$mail->PluginDir  = sprintf("%sinc/phpmailer/", PATH);
 
 		$mail->IsSMTP();
 		$mail->SMTPAuth   = true;
@@ -412,7 +426,11 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
 		$mail->Port       = 25;
 		$mail->Username   = SMTP_USER;
 		$mail->Password   = SMTP_PASSWORD;
-		$mail->From       = $from;
+		if (empty($from)) {
+			$mail->From = WEBMASTER;
+		} else {
+			$mail->From = $from;
+		}
 		$mail->FromName   = MAIN_TITLE;
 		$mail->Subject    = $subject;
 		if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) {
@@ -462,7 +480,7 @@ function GEN_PASS($LEN = 0) {
 	return $PASS;
 }
 //
-function MAKE_DATETIME($time, $mode="0")
+function MAKE_DATETIME ($time, $mode="0")
 {
 	if ($time == 0) {
 		// Never happend
@@ -475,8 +493,7 @@ function MAKE_DATETIME($time, $mode="0")
 	switch (GET_LANGUAGE())
 	{
 	case "de": // German date / time format
-		switch ($mode)
-		{
+		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;
@@ -485,8 +502,7 @@ function MAKE_DATETIME($time, $mode="0")
 		break;
 
 	default:	// Default is the US date / time format!
-		switch ($mode)
-		{
+		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;
@@ -497,70 +513,55 @@ function MAKE_DATETIME($time, $mode="0")
 }
 
 // Translates the american decimal dot into a german comma
-function TRANSLATE_COMMA($dotted, $cut=true)
-{
+function TRANSLATE_COMMA ($dotted, $cut=true) {
 	global $_CONFIG;
+
 	// Default is 3 you can change this in admin area "Misc -> Misc Options"
 	if (empty($_CONFIG['max_comma'])) $_CONFIG['max_comma'] = "3";
-	if (!ereg("\.", $dotted)) $dotted .= ".".str_repeat("0", $_CONFIG['max_comma']);
-	if ($cut) {
-		// Remove trailing zeros
-		$dot = str_replace(".", "x", $dotted);
-		while(substr($dot, -1, 1) == "0") {
-			$dot = substr($dot, 0, -1);
-		}
+	$maxComma = $_CONFIG['max_comma'];
 
-		if (substr($dot, -1, 1) == "x") {
-			// Last char is the 'x'
-			$dotted = substr($dot, 0, -1);
+	// Cut zeros off?
+	if ($cut) {
+		// 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 don't display them
+				$maxComma = 0;
+			} // END - if
 		} else {
-			// Last char is a number
-			$dotted = str_replace("x", ".", $dot);
+			// Don't display commatas even if there are none... ;-)
+			$maxComma = 0;
 		}
-	}
+	} // END - if
+
+	// Debug log
+	//DEBUG_LOG(__FUNCTION__.":dotted={$dotted},maxComma={$maxComma}");
 
 	// Translate it now
 	switch (GET_LANGUAGE()) {
 	case "de":
-		$pos = strpos($dotted, ".");
-		if ($pos > 0) {
-			if ($cut) {
-				// Cut x numbers behind comma
-				$dotted = str_replace(".", ",", substr($dotted, 0, ($pos + $_CONFIG['max_comma'] + 1)));
-			} else {
-				// Replace comma with dot
-				$dotted = str_replace(".", ",", $dotted);
-			}
-		} elseif (!$cut) {
-			if (empty($pos)) {
-				$dotted = "0,".str_repeat("0", $_CONFIG['max_comma']);
-			} else {
-				$dotted .= ",".str_repeat("0", $_CONFIG['max_comma']);
-			}
-		}
+		$dotted = number_format($dotted, $maxComma, ",", ".");
 		break;
 
 	default:
-		if (!$cut) {
-			if ($pos > 0) {
-				$dotted = substr($dotted, 0, ($pos + $_CONFIG['max_comma'] + 1));
-			} else {
-				$dotted .= ".".str_repeat("0", $_CONFIG['max_comma']);
-			}
-		}
+		$dotted = number_format($dotted, $maxComma, ".", ",");
 		break;
 	}
+
+	// Return translated value
 	return $dotted;
 }
 
 //
-function DEREFERER($URL) {
-	$URL = URL."/modules.php?module=loader&amp;url=".urlencode(base64_encode(COMPILE_CODE($URL)));
+function DEREFERER ($URL) {
+	$URL = URL."/modules.php?module=loader&amp;url=".urlencode(base64_encode(gzcompress($URL)));
 	return $URL;
 }
 
 //
-function TRANSLATE_SEX($sex) {
+function TRANSLATE_SEX ($sex) {
 	switch ($sex)
 	{
 		case "M": $ret = SEX_M; break;
@@ -571,8 +572,7 @@ function TRANSLATE_SEX($sex) {
 	return $ret;
 }
 //
-function GET_POOL_TYPE($PT)
-{
+function GET_POOL_TYPE($PT) {
 	switch ($PT)
 	{
 		case "TEMP"   : $ret = POOL_TEMP;    break;
@@ -586,33 +586,30 @@ function GET_POOL_TYPE($PT)
 	return $ret;
 }
 //
-function FRAMETESTER($URL)
-{
-	global $_SERVER;
-	$URL = URL."/modules.php?module=frametester&amp;url=".urlencode(base64_encode(COMPILE_CODE($URL)));
-	return $URL;
+function FRAMETESTER($URL) {
+	// Prepare frametester URL
+	$frametesterUrl = sprintf("%s/modules.php?module=frametester&amp;url=%s",
+		URL,
+		urlencode(base64_encode(gzcompress(COMPILE_CODE($URL))))
+	);
+	return $frametesterUrl;
 }
 //
-function SELECTION_COUNT($array)
-{
+function SELECTION_COUNT($array) {
 	$ret = "0";
-	if (is_array($array))
-	{
-		foreach ($array as $key=>$sel)
-		{
+	if (is_array($array)) {
+		foreach ($array as $key => $sel) {
 			if (!empty($sel)) $ret++;
 		}
 	}
 	return $ret;
 }
 //
-function IMG_CODE ($code, $type, $DATA, $uid)
-{
+function IMG_CODE ($code, $type, $DATA, $uid) {
 	return "<IMG border=\"0\" alt=\"Code\" src=\"".URL."/mailid_top.php?uid=".$uid."&amp;".$type."=".$DATA."&amp;mode=img&amp;code=".$code."\">";
 }
 //
-function TRANSLATE_STATUS($status)
-{
+function TRANSLATE_STATUS($status) {
 	switch ($status)
 	{
 	case "UNCONFIRMED":
@@ -676,9 +673,12 @@ function SET_LANGUAGE($lang) {
 function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	global $DATA, $_CONFIG, $REPLACER;
 
+	// Make sure all template names are lowercase!
+	$template = strtolower($template);
+
 	// Keept for backward-compatiblity (please replace these variables against our new {--CONST--} syntax!)
 	$MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
-	$surname = ""; $family = ""; $nick = ""; $sex = 'N';
+	$surname = ""; $family = ""; $nick = ""; $sex = "N";
 
 	// Prepare IP number and User Agent
 	$REMOTE_ADDR = getenv('REMOTE_ADDR');
@@ -688,7 +688,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	if (isSessionVariableSet('admin_login')) {
 		// Load Admin data
 		$result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-			array(SQL_ESCAPE(get_session('admin_login'))), __FILE__, __LINE__);
+			array(get_session('admin_login')), __FILE__, __LINE__);
 		list($ADMIN) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
@@ -705,6 +705,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 		$EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS;
 	}
 
+	// DEPRECATED switch!
 	switch ($template)
 	{
 	case "bonus-mail": // Load data for the bonus mail
@@ -786,7 +787,11 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 		break;
 
 	case "add-points":
-		$points		= bigintval($_POST['points']);
+		if (isset($_POST['points'])) {
+			$points		= bigintval($_POST['points']);
+		} else {
+			$points = __POINTS_VALUE;
+		}
 		break;
 
 	case "guest_request_confirm":
@@ -798,13 +803,13 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	if ($UID > 0) {
 		if (EXT_IS_ACTIVE("nickname")) {
 			// Load nickname
-			$result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
 			 array(bigintval($UID)), __FILE__, __LINE__);
 			list($surname, $family, $sex, $email, $nick) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		} else {
 			// Load normal data
-			$result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
 			 array(bigintval($UID)), __FILE__, __LINE__);
 			list($surname, $family, $sex, $email) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
@@ -812,7 +817,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 		}
 	} else {
 		// Neutral sex and email address is default
-		$sex = 'N';
+		$sex = "N";
 		$email = WEBMASTER;
 	}
 
@@ -823,7 +828,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	$DATA['email'] = $email;
 
 	// Base directory
-	$BASE = PATH."templates/".GET_LANGUAGE()."/emails/";
+	$BASE = sprintf("%stemplates/%s/emails/", PATH, GET_LANGUAGE());
 
 	// Check for admin/guest/member templates
 	if (strpos($template, "admin_") > -1) {
@@ -851,11 +856,10 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	if ((!@file_exists($file)) || (!is_readable($file))) {
 		// Reset to default template
 		$file = $BASE.$template.".tpl";
-	}
+	} // END - if
 
 	// Now does the final template exists?
-	if ((@file_exists($file)) && (is_readable($file)))
-	{
+	if ((@file_exists($file)) && (is_readable($file))) {
 		// The local file does exists so we load it. :)
 		$tmpl_file = @implode("", @file($file));
 		$tmpl_file = addslashes($tmpl_file);
@@ -869,9 +873,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 
 		// Replace HTML confirm chars
 		$content = html_entity_decode($content);
-	}
-	 elseif (!empty($template))
-	{
+	} elseif (!empty($template)) {
 		// Template file not found!
 		$content = TEMPLATE_404.": ".$template."<br />
 ".TEMPLATE_CONTENT."
@@ -882,17 +884,16 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 
 		// Debug mode not active? Then remove the HTML tags
 		if (!DEBUG_MODE) $content = strip_tags($content);
-	}
-	 else
-	{
+	} else {
 		// No template name supplied!
 		$content = NO_TEMPLATE_SUPPLIED;
 	}
+
+	// Return compiled content
 	return COMPILE_CODE($content);
 }
 //
-function MAKE_TIME($H, $M, $S, $stamp)
-{
+function MAKE_TIME($H, $M, $S, $stamp) {
 	// Extract day, month and year from given timestamp
 	$DAY   = date("d", $stamp);
 	$MONTH = date("m", $stamp);
@@ -914,6 +915,12 @@ function LOAD_URL($URL, $addUrlData=true) {
 	// Compile out URI codes
 	$URL = COMPILE_CODE($URL);
 
+	// Get output buffer
+	$OUTPUT = ob_get_contents();
+
+	// Clear it
+	ob_end_clean();
+
 	// Add some data to URL if cookies are not accepted
 	if (((!defined('__COOKIES')) || (!__COOKIES)) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
 
@@ -926,6 +933,11 @@ function LOAD_URL($URL, $addUrlData=true) {
 		OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>");
 	} elseif (!headers_sent()) {
 		// Load URL when headers are not sent
+		/*
+		print("<pre>");
+		debug_print_backtrace();
+		die("</pre>URL={$URL}");
+		*/
 		@header ("Location: ".str_replace("&amp;", "&", $URL));
 	} else {
 		// Output error message
@@ -1146,10 +1158,10 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 
 	case "yn":
 		$OUT .= "      <OPTION value=\"Y\"";
-		if ($DEFAULT == 'Y') $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
 		$OUT .= ">".YES."</OPTION>
 			<OPTION value=\"N\"";
-		if ($DEFAULT == 'N') $OUT .= " selected=\"selected\"";
+		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
 		$OUT .= ">".NO."</OPTION>\n";
 		break;
 	}
@@ -1171,15 +1183,21 @@ function TRANSLATE_YESNO($yn)
 // Deprecated : $length
 // Optional   : $DATA
 //
-function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
-{
+function GEN_RANDOM_CODE($length, $code, $uid, $DATA="") {
 	global $_CONFIG;
 
+	// Fix missing _MAX constant
+	if (!defined('_MAX')) define('_MAX', 15235);
+
 	// Build server string
 	$server = $_SERVER['PHP_SELF'].":".getenv('HTTP_USER_AGENT').":".getenv('SERVER_SOFTWARE').":".getenv('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)", $_CONFIG['patch_ctime']).":".$_CONFIG['master_salt'];
+	$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)", $_CONFIG['patch_ctime']);
+	if (isset($_CONFIG['master_salt'])) $keys .= ":".$_CONFIG['master_salt'];
 
 	// Build string from misc data
 	$data   = $code.":".$uid.":".$DATA;
@@ -1195,11 +1213,19 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
 	// Calculate number for generating the code
 	$a = $code + _ADD - 1;
 
-	// 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']);
+	if (isset($_CONFIG['master_hash'])) {
+		// 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']);
 
-	// Create number from hash
-	$rcode = hexdec(substr($saltedHash, strlen($_CONFIG['master_salt']), 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
+		// Create number from hash
+		$rcode = hexdec(substr($saltedHash, strlen($_CONFIG['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));
+
+		// Create number from hash
+		$rcode = hexdec(substr($saltedHash, 8, 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
+	}
 
 	// At least 10 numbers shall be secure enought!
 	$len = $_CONFIG['code_length'];
@@ -1212,14 +1238,15 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
 	return $return;
 }
 // Does only allow numbers
-function bigintval($num)
-{
-	$ret = (int) preg_replace("/[^0123456789]/", "", $num);
+function bigintval($num, $castValue = true) {
+	// Filter all numbers out
+	$ret = preg_replace("/[^0123456789]/", "", $num);
+
+	// Return result
 	return $ret;
 }
 // Insert the code in $img_code into jpeg or PNG image
-function GENERATE_IMAGE($img_code, $header=true)
-{
+function GENERATE_IMAGE($img_code, $header=true) {
 	global $_CONFIG;
 	if ((strlen($img_code) > 6) || (empty($img_code)) || ($_CONFIG['code_length'] == 0))
 	{
@@ -1236,14 +1263,11 @@ function GENERATE_IMAGE($img_code, $header=true)
 	{
 	case "jpg":
 		// Loads JPEG image
-		$img = PATH."/theme/".GET_CURR_THEME()."/images/code_bg.jpg";
-		if ((file_exists($img)) && (is_readable($img)))
-		{
+		$img = sprintf("%s/theme/%s/images/code_bg.jpg", PATH, GET_CURR_THEME());
+		if ((file_exists($img)) && (is_readable($img))) {
 			// Okay, load image and hide all errors
 			$image = @imagecreatefromjpeg($img);
-		}
-		 else
-		{
+		} else 	{
 			// Exit function here
 			return;
 		}
@@ -1251,14 +1275,11 @@ function GENERATE_IMAGE($img_code, $header=true)
 
 	case "png":
 		// Loads PNG image
-		$img = PATH."/theme/".GET_CURR_THEME()."/images/code_bg.png";
-		if ((file_exists($img)) && (is_readable($img)))
-		{
+		$img = sprintf("%s/theme/%s/images/code_bg.png", PATH, GET_CURR_THEME());
+		if ((file_exists($img)) && (is_readable($img))) {
 			// Okay, load image and hide all errors
 			$image = @imagecreatefrompng($img);
-		}
-		 else
-		{
+		} else {
 			// Exit function here
 			return;
 		}
@@ -1275,8 +1296,7 @@ function GENERATE_IMAGE($img_code, $header=true)
 	header ("Content-Type: image/".$_CONFIG['img_type']);
 
 	// Output image with matching image factory
-	switch ($_CONFIG['img_type'])
-	{
+	switch ($_CONFIG['img_type']) {
 		case "jpg": imagejpeg($image); break;
 		case "png": imagepng($image);  break;
 	}
@@ -1357,7 +1377,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 		}
 		if (ereg("s", $display) || (empty($display)))
 		{
-			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">".SECS."</STRONG></TD>\n";
+			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._SECONDS."</STRONG></TD>\n";
 		}
 		$OUT .= "</TR>\n";
 		$OUT .= "<TR>\n";
@@ -1507,7 +1527,8 @@ function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
 	return $ret;
 }
 // Sends out mail to all administrators
-function SEND_ADMIN_EMAILS_PRO($subj, $template, $content="", $UID="0") {
+// IMPORTANT: Please use SEND_ADMIN_NOTIFCATION() for now!
+function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
 	// Trim template name
 	$template = trim($template);
 
@@ -1634,44 +1655,164 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
 	}
 }
 
-//
-function MXCHANGE_OPEN ($script) {
-	// Compile the script name
-	$script = COMPILE_CODE($script);
-
+// Extract host from script name
+function EXTRACT_HOST (&$script) {
 	// Use default SERVER_URL by default... ;) So?
 	$url = SERVER_URL;
+
+	// Is this URL valid?
 	if (substr($script, 0, 7) == "http://") {
 		// Use the hostname from script URL as new hostname
 		$url = substr($script, 7);
 		$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, "/"));
 
 	// Generate relative URL
-	$script = substr($script, (strlen($url) + 7));
+	//* DEBUG */ print("SCRIPT=".$script."<br />\n");
+	if (substr(strtolower($script), 0, 7) == "http://") {
+		// But only if http:// is in front!
+		$script = substr($script, (strlen($url) + 7));
+	} elseif (substr(strtolower($script), 0, 8) == "https://") {
+		// Does this work?!
+		$script = substr($script, (strlen($url) + 8));
+	}
+
+	//* DEBUG */ print("SCRIPT=".$script."<br />\n");
 	if (substr($script, 0, 1) == "/") $script = substr($script, 1);
 
-	// Open connection
-	$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
-	if (!$fp) {
-		// Failed!
+	// Return host name
+	return $host;
+}
+
+// Send a GET request
+function GET_URL ($script) {
+	// Compile the script name
+	$script = COMPILE_CODE($script);
+
+	// Extract host name from script
+	$host = EXTRACT_HOST($script);
+
+	// Generate GET request header
+	$request  = "GET /" . trim($script) . " HTTP/1.1\r\n";
+	$request .= "Host: " . $host . "\r\n";
+	$request .= "Referer: " . URL . "/admin.php\r\n";
+	$request .= "User-Agent: " . TITLE . "/" . FULL_VERSION . "\r\n";
+	$request .= "Content-Type: text/plain\r\n";
+	$request .= "Cache-Control: no-cache\r\n";
+	$request .= "Connection: Close\r\n\r\n";
+
+	// Send the raw request
+	$response = SEND_RAW_REQUEST($host, $request);
+
+	// Return the result to the caller function
+	return $response;
+}
+
+// Send a POST request
+function POST_URL ($script, $postData) {
+	// Is postData an array?
+	if (!is_array($postData)) {
+		// Abort here
 		return array("", "", "");
-	}
+	} // END - if
 
-	// Generate request header
-	$request  = "GET /".trim($script)." HTTP/1.0\r\n";
-	$request .= "Host: ".$host."\r\n";
-	$request .= "Referer: ".URL."/admin.php\r\n";
-	$request .= "User-Agent: ".TITLE."/".FULL_VERSION."\r\n\r\n";
+	// Compile the script name
+	$script = COMPILE_CODE($script);
+
+	// Extract host name from script
+	$host = EXTRACT_HOST($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: " . URL . "/admin.php\r\n";
+	$request .= "User-Agent: " . TITLE . "/" . 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 .= $data;
+
+	// Send the raw request
+	$response = SEND_RAW_REQUEST($host, $request);
+
+	// Return the result to the caller function
+	return $response;
+}
+
+// Sends a raw request to another host
+function SEND_RAW_REQUEST ($host, $request) {
+	global $_CONFIG;
 
 	// Initialize array
-	$response = array();
+	$response = array("", "", "");
+
+	// Default is not to use proxy
+	$useProxy = false;
+
+	// Are proxy settins set?
+	if ((!empty($_CONFIG['proxy_host'])) && ($_CONFIG['proxy_port'] > 0)) {
+		// Then use it
+		$useProxy = true;
+	} // END - if
+
+	// Open connection
+	//* DEBUG */ die("SCRIPT=".$script."<br />\n");
+	if ($useProxy) {
+		$fp = @fsockopen(COMPILE_CODE($_CONFIG['proxy_host']), $_CONFIG['proxy_port'], $errno, $errdesc, 30);
+	} else {
+		$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
+	}
+
+	// Is there a link?
+	if (!is_resource($fp)) {
+		// Failed!
+		return $response;
+	} // END - if
+
+	// Do we use proxy?
+	if ($useProxy) {
+		// Generate CONNECT request header
+		$proxyTunnel  = "CONNECT ".$host.":80 HTTP/1.1\r\n";
+		$proxyTunnel .= "Host: ".$host."\r\n";
+
+		// Use login data to proxy? (username at least!)
+		if (!empty($_CONFIG['proxy_username'])) {
+			// Add it as well
+			$encodedAuth = base64_encode(COMPILE_CODE($_CONFIG['proxy_username']).":".COMPILE_CODE($_CONFIG['proxy_password']));
+			$proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
+		} // END - if
+
+		// Add last new-line
+		$proxyTunnel .= "\r\n";
+		//* DEBUG: */ print("<strong>proxyTunnel=</strong><pre>".$proxyTunnel."</pre>");
+
+		// Write request
+		fputs($fp, $proxyTunnel);
+
+		// Got response?
+		if (feof($fp)) {
+			// No response received
+			return $response;
+		} // END - if
+
+		// Read the first line
+		$resp = trim(fgets($fp, 10240));
+		$respArray = explode(" ", $resp);
+		if ((strtolower($respArray[0]) !== "http/1.0") || ($respArray[1] != "200")) {
+			// Invalid response!
+			return $response;
+		} // END - if
+	} // END - if
 
 	// Write request
 	fputs($fp, $request);
@@ -1679,16 +1820,41 @@ function MXCHANGE_OPEN ($script) {
 	// Read response
 	while(!feof($fp)) {
 		$response[] = trim(fgets($fp, 1024));
-	}
+	} // END - while
 
 	// Close socket
 	fclose($fp);
 
+	// Skip first empty lines
+	$resp = $response;
+	foreach ($resp as $idx => $line) {
+		// Trim space away
+		$line = trim($line);
+
+		// Is this line empty?
+		if (empty($line)) {
+			// Then remove it
+			array_shift($response);
+		} else {
+			// Abort on first non-empty line
+			break;
+		}
+	} // END - foreach
+
+	//* DEBUG: */ print("<strong>Response:</strong><pre>".print_r($response, true)."</pre>");
+
+	// Proxy agent found?
+	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 ((!ereg("200 OK", $response[0])) && (empty($response[0]))) {
+	if ((!eregi("200 OK", $response[0])) || (empty($response[0]))) {
 		// Not found / access forbidden
 		$response = array("", "", "");
-	}
+	} // END - if
 
 	// Return response
 	return $response;
@@ -1760,7 +1926,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 	}
 
 	// Finish navigation link
-	$eval = substr($eval, 0, -7) . "]\";";
+	$eval = substr($eval, 0, -7)."]\";";
 	eval($eval);
 
 	// Return string
@@ -1780,7 +1946,7 @@ function CREATE_EMAIL_LINK($email, $table="admins") {
 	if ((EXT_IS_ACTIVE("admins")) && ($table == "admins")) {
 		// Create email link for contacting admin in guest area
 		$EMAIL = ADMINS_CREATE_EMAIL_LINK($email);
-	} elseif ((GET_EXT_VERSION("user") >= "0.3.3") && ($table == "user_data")) {
+	} elseif ((EXT_IS_ACTIVE("user", true)) && (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")) {
@@ -1795,14 +1961,22 @@ function CREATE_EMAIL_LINK($email, $table="admins") {
 	return $EMAIL;
 }
 // Generate a hash for extra-security for all passwords
-function generateHash($plainText, $salt = "") {
+function generateHash ($plainText, $salt = "") {
 	global $_CONFIG, $_SERVER;
 
-	// Is the required extension "sql_patches" there?
-	if ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) {
+	// Is the required extension "sql_patches" there and a salt is not given?
+	if (((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) && (empty($salt))) {
 		// Extension sql_patches is missing/outdated so we return the plain text
 		return $plainText;
-	}
+	} // END - if
+
+	// Do we miss an arry element here?
+	if (!isset($_CONFIG['file_hash'])) {
+		// Stop here
+		print(__FUNCTION__.":<pre>");
+		debug_print_backtrace();
+		die("</pre>");
+	} // END - if
 
 	// When the salt is empty build a new one, else use the first x configured characters as the salt
 	if ($salt == "") {
@@ -1829,14 +2003,14 @@ function generateHash($plainText, $salt = "") {
 		// Generate the password salt string
 		$salt = substr($sha1, 0, $_CONFIG['salt_length']);
 		//* DEBUG: */ echo $salt." (".strlen($salt).")<br />";
-	}
-	 else
-	{
+	} else {
+		// Use given salt
 		$salt = substr($salt, 0, $_CONFIG['salt_length']);
+		//* DEBUG: */ echo "GIVEN={$salt}<br />\n";
 	}
 
 	// Return hash
-	return $salt . sha1($salt . $plainText);
+	return $salt.sha1($salt.$plainText);
 }
 //
 function scrambleString($str) {
@@ -1958,7 +2132,7 @@ function ADD_URL_DATA($URL)
 	// 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) {
 	global $_CONFIG;
 
@@ -1983,15 +2157,22 @@ function generatePassString($passHash) {
 			//* DEBUG: */ echo "*".$start."=".$mod."*<br>";
 			$start += 4;
 			$newHash .= $mod;
-		}
+		} // END - for
 
-		//* DEBUG: */ die($passHash."<br>".$newHash." (".strlen($newHash).")");
+		//* DEBUG: */ print($passHash."<br>".$newHash." (".strlen($newHash).")");
 		$ret = generateHash($newHash, $_CONFIG['master_salt']);
+		//* DEBUG: */ print($ret."<br />\n");
+	} else {
+		// Hash it simple
+		//* DEBUG: */ echo "--".$passHash."--<br />\n";
+		$ret = md5($passHash);
+		//* DEBUG: */ echo "++".$ret."++<br />\n";
 	}
 
 	// Return result
 	return $ret;
 }
+
 // Fix "deleted" cookies
 function FIX_DELETED_COOKIES ($cookies) {
 	// Is this an array with entries?
@@ -2005,6 +2186,7 @@ function FIX_DELETED_COOKIES ($cookies) {
 		}
 	}
 }
+
 // Output error messages in a fasioned way and die...
 function mxchange_die ($msg) {
 	global $footer;
@@ -2051,6 +2233,7 @@ function DISPLAY_PARSING_TIME_FOOTER() {
 // Unset/set session variables
 function set_session ($var, $value) {
 	global $CSS;
+
 	// Abort in CSS mode here
 	if ($CSS == 1) return true;
 
@@ -2068,6 +2251,12 @@ function set_session ($var, $value) {
 		//* DEBUG: */ echo "SET:".$var."=".$value."<br />\n";
 		$_SESSION[$var] =  $value;
 		return session_register($var);
+	} elseif (!empty($value)) {
+		// Update session
+		$_SESSION[$var] = $value;
+	} else {
+		// Something bad happens!
+		return false; // Hope this doesn't make so much trouble???
 	}
 
 	// Return always true if the session variable is already set.
@@ -2075,6 +2264,7 @@ function set_session ($var, $value) {
 	//* DEBUG: */ echo "IGNORED:".$var."=".$value."<br />\n";
 	return true;
 }
+
 // Check wether a boolean constant is set
 // Taken from user comments in PHP documentation for function constant()
 function isBooleanConstantAndTrue($constname) { // : Boolean
@@ -2087,11 +2277,8 @@ function isBooleanConstantAndTrue($constname) { // : Boolean
 function isSessionVariableSet($var) {
 	return (isset($_SESSION[$var]));
 }
-
 // Returns wether the value of the session variable or NULL if not set
 function get_session($var) {
-	if (!isset($_SESSION)) session_start();
-
 	// Default is not found! ;-)
 	$value = null;
 
@@ -2099,28 +2286,169 @@ function get_session($var) {
 	if (isSessionVariableSet($var)) {
 		// Then  get it secured!
 		$value = SQL_ESCAPE($_SESSION[$var]);
-	}
+	} // END - if
 
 	// Return the value
 	return $value;
 }
+// Send notification to admin
+function SEND_ADMIN_NOTIFICATION($subject, $templateName, $content="", $uid="0") {
+	if (GET_EXT_VERSION("admins") >= "0.4.1") {
+		// Send new way
+		SEND_ADMIN_EMAILS_PRO($subject, $templateName, $content, $uid);
+	} else {
+		// Send outdated way
+		$msg = LOAD_EMAIL_TEMPLATE($templateName, $content, $uid);
+		SEND_ADMIN_EMAILS($subject, $msg);
+	}
+}
+// Destroy user session
+function destroy_user_session () {
+	// Remove all user data from session
+	return ((set_session("userid", "")) && (set_session("u_hash", "")) && (set_session("lifetime", "")));
+}
+// 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
+		return $array1;
+	}
+
+	// Something wired happened here...
+	print(__FUNCTION__.":<pre>");
+	debug_print_backtrace();
+	die("</pre>");
+}
+// Debug message logger
+function DEBUG_LOG ($message) {
+	// Is debug mode enabled?
+	if (isBooleanConstantAndTrue('DEBUG_MODE')) {
+		// 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())."|{$message}\n");
+		fclose($fp);
+	} // END - if
+}
+// Reads a directory with PHP files in and gets only files back
+function GET_DIR_AS_ARRAY ($baseDir, $prefix) {
+	$INCs = array();
+
+	// Open directory
+	$dirPointer = opendir($baseDir) or mxchange_die("Cannot read ".basename($baseDir)." path!");
+
+	// Read all entries
+	while ($baseFile = readdir($dirPointer)) {
+		// Load file only if extension is active
+		// Make full path
+		$file = $baseDir.$baseFile;
+
+		// Is this a valid reset file?
+		if ((is_file($file)) && (is_readable($file)) && (substr($baseFile, 0, strlen($prefix)) == $prefix) && (substr($baseFile, -4, 4) == ".php")) {
+			// Remove both for extension name
+			$extName = substr($baseFile, strlen($prefix), -4);
+
+			// Try to find it
+			$extId = GET_EXT_ID($extName);
+
+			// Is the extension valid and active?
+			if (($extId > 0) && (EXT_IS_ACTIVE($extName))) {
+				// Then add this file
+				$INCs[] = $file;
+			}
+		} // END - if
+	} // END - while
+
+	// Close directory
+	closedir($dirPointer);
 
+	// Return array with include files
+	return $INCs;
+}
+// Load more reset scripts
+function RESET_ADD_INCLUDES () {
+	global $_CONFIG, $INC_POOL;
+
+	// Is the reset set or old sql_patches?
+	if ((!isBooleanConstantAndTrue('__DAILY_RESET')) || (GET_EXT_VERSION("sql_patches") < "0.4.5")) {
+		// Then abort here
+		return;
+	} // END - if
+
+	// Get more daily reset scripts
+	$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_"));
+
+	// Create current week mark
+	$currWeek = date("W", time());
+
+	// Has it changed?
+	if ($_CONFIG['last_week'] != $currWeek) {
+		// Include weekly reset scripts
+		$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/weekly/", "weekly_"));
+
+		// Update config
+		UPDATE_CONFIG("last_week", $currWeek);
+	} // END - if
+
+	// Create current month mark
+	$currMonth = date("m", time());
+
+	// Has it changed?
+	if ($_CONFIG['last_month'] != $currMonth) {
+		// Include monthly reset scripts
+		$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/monthly/", "monthly_"));
+
+		// Update config
+		UPDATE_CONFIG("last_month", $currMonth);
+	} // END - if
+}
+// Handle extra values
+function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {
+	// Default is the value itself
+	$ret = $value;
+
+	// Do we have a special filter function?
+	if (!empty($filterFunction)) {
+		// Do we have extra parameters here?
+		if (!empty($extraValue)) {
+			// Put both parameters in one new array by default
+			$args = array($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($vaue), $extraValue);
+			} // END - if
+
+			// Call the multi-parameter call-back
+			$ret = call_user_func_array($filterFunction, $args);
+		} else {
+			// One parameter call
+			$ret = call_user_func($filterFunction, $value);
+		}
+	} // END - if
+
+	// Return the value
+	return $ret;
+}
 //
-//////////////////////////////////////////////
-//                                          //
-// AUTOMATICALLY RE-GNERATED FUNCTIONS ONLY //
-//                                          //
-//////////////////////////////////////////////
+//////////////////////////////////////////////////
+//                                              //
+// AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
+//                                              //
+//////////////////////////////////////////////////
 //
-if (!function_exists('html_entity_decode'))
-{
+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);
 	}
 }
+
 //
 ?>