X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=8b416e865c721fa80ad535632a30afbe752e7a18;hp=7db231cb3ac38a47e97865b47e499fbc986ff457;hb=0369c36aaab5af6ed44da1e13a53baef285f79b4;hpb=23b99ebc3174c1cf876248ece696e9ed6bb1aa71

diff --git a/inc/functions.php b/inc/functions.php
index 7db231cb3a..8b416e865c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -53,6 +53,7 @@ function is_INCWritable($inc) {
 // Open a table (you may want to add some header stuff here)
 function OPEN_TABLE($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_only=false) {
 	global $table_cnt;
+
 	// Count tables so we can generate CSS classes for every table... :-)
 	if (empty($CLASS)) {
 		// Class is empty so count one up and create a class
@@ -198,6 +199,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']++;
@@ -269,20 +273,20 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 		);
 
 		// Probe for it...
-		if (file_exists($file2)) $file = $file2;
+		if (FILE_READABLE($file2)) $file = $file2;
 
 		// Remove variable from memory
 		unset($file2);
 	}
 
 	// Does the special template exists?
-	if ((!file_exists($file)) || (!is_readable($file))) {
+	if (!FILE_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_READABLE($file)) {
 		// The local file does exists so we load it. :)
 		$tmpl_file = implode("", file($file));
 
@@ -338,7 +342,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") {
 	$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);
@@ -348,6 +352,9 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") {
 			list($TO) = SQL_FETCHROW($result_email);
 			SQL_FREERESULT($result_email);
 		}
+	} elseif ($TO == 0) {
+		// Is the webmaster!
+		$TO = WEBMASTER;
 	}
 
 	// Not in PHPMailer-Mode
@@ -474,7 +481,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
@@ -487,8 +494,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;
@@ -497,8 +503,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;
@@ -509,69 +514,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&url=".urlencode(base64_encode(gzcompress(COMPILE_CODE($URL))));
+function DEREFERER ($URL) {
+	$URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL)));
 	return $URL;
 }
 
 //
-function TRANSLATE_SEX($sex) {
+function TRANSLATE_SEX ($sex) {
 	switch ($sex)
 	{
 		case "M": $ret = SEX_M; break;
@@ -606,7 +597,7 @@ function FRAMETESTER($URL) {
 }
 //
 function SELECTION_COUNT($array) {
-	$ret = "0";
+	$ret = 0;
 	if (is_array($array)) {
 		foreach ($array as $key => $sel) {
 			if (!empty($sel)) $ret++;
@@ -656,7 +647,7 @@ function GET_LANGUAGE() {
 	// Check GET variable and cookie
 	if (!empty($lang)) {
 		// Check if main language file does exist
-		if (file_exists(PATH."inc/language/".$lang.".php")) {
+		if (FILE_READABLE(PATH."inc/language/".$lang.".php")) {
 			// Okay found, so let's update cookies
 			SET_LANGUAGE($lang);
 		}
@@ -683,6 +674,9 @@ 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";
@@ -695,7 +689,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);
 	}
@@ -725,7 +719,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 		$DATA[10]   = $UID;
 
 		// Replace variables
-		foreach ($REPLACER as $key=>$value)
+		foreach ($REPLACER as $key => $value)
 		{
 			if (isset($DATA[$key])) $content = str_replace($value, $DATA[$key], $content);
 		}
@@ -775,7 +769,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 		$MAILID     = $DATA[11];
 
 		// Replace variables
-		foreach ($REPLACER as $key=>$value)
+		foreach ($REPLACER as $key => $value)
 		{
 			if (isset($DATA[$key])) $content = str_replace($value, $DATA[$key], $content);
 		}
@@ -860,44 +854,48 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	}
 
 	// Does the special template exists?
-	if ((!@file_exists($file)) || (!is_readable($file))) {
+	if (!FILE_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))) {
+	$newContent = "";
+	if (FILE_READABLE($file)) {
 		// The local file does exists so we load it. :)
 		$tmpl_file = @implode("", @file($file));
 		$tmpl_file = addslashes($tmpl_file);
 
-		// Compile code
-		$tmpl_file = COMPILE_CODE($tmpl_file);
-
 		// Run code
-		$tmpl_file = "\$content=\"".$tmpl_file."\";";
+		$tmpl_file = "\$newContent=\"".COMPILE_CODE($tmpl_file)."\";";
 		eval($tmpl_file);
 
-		// Replace HTML confirm chars
-		$content = html_entity_decode($content);
+		// Replace HTML conform chars
+		$newContent = html_entity_decode($newContent);
 	} elseif (!empty($template)) {
 		// Template file not found!
-		$content = TEMPLATE_404.": ".$template."<br />
+		$newContent = TEMPLATE_404.": ".$template."<br />
 ".TEMPLATE_CONTENT."
-<PRE>".print_r($content, true)."</PRE>
+<PRE>".print_r($newContent, true)."</PRE>
 ".TEMPLATE_DATA."
 <PRE>".print_r($DATA, true)."</PRE>
 <br /><br />";
 
 		// Debug mode not active? Then remove the HTML tags
-		if (!DEBUG_MODE) $content = strip_tags($content);
+		if (!DEBUG_MODE) $newContent = strip_tags($newContent);
 	} else {
 		// No template name supplied!
-		$content = NO_TEMPLATE_SUPPLIED;
+		$newContent = NO_TEMPLATE_SUPPLIED;
 	}
 
+	// Is there some content?
+	if (empty($newContent)) {
+		// Compiling failed
+		$newContent = "Compiler error for template {$template}!";
+	} // END - if
+
 	// Return compiled content
-	return COMPILE_CODE($content);
+	return COMPILE_CODE($newContent);
 }
 //
 function MAKE_TIME($H, $M, $S, $stamp) {
@@ -911,7 +909,7 @@ function MAKE_TIME($H, $M, $S, $stamp) {
 }
 //
 function LOAD_URL($URL, $addUrlData=true) {
-	global $CSS, $_CONFIG, $link, $db, $footer;
+	global $CSS, $_CONFIG, $footer;
 
 	// Check if http(s):// is there
 	if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
@@ -989,20 +987,21 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
 	if ((count($matches) > 0) && (count($matches[0]) > 0)) {
 		// Replace all matches
 		$matchesFound = array();
-		foreach ($matches[0] as $key=>$match) {
+		foreach ($matches[0] as $key => $match) {
 			// Avoid replacing matches multiple times
 			if (!isset($matchesFound[$match])) {
 				// Not yet replaced!
 				$code = str_replace($match, "\".".$match.".\"", $code);
 				$matchesFound[$match] = 1;
-			}
+			} // END - if
 
 			// Take all string elements
 			if (("".bigintval($matches[4][$key])."" != $matches[4][$key]) && (!isset($matchesFound[$key."_".$matches[4][$key]]))) {
 				// Replace it in the code
-				$code = str_replace("[".$matches[4][$key]."]", "['".$matches[4][$key]."']", $code);
+				$newMatch = str_replace("[".$matches[4][$key]."]", "['".$matches[4][$key]."']", $match);
+				$code = str_replace($match, $newMatch, $code);
 				$matchesFound[$key."_".$matches[4][$key]] = 1;
-			}
+			} // END - if
 		}
 	}
 
@@ -1031,9 +1030,9 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 	$dummy = $array;
 	while ($primary_key < count($a_sort))
 	{
-		foreach ($dummy[$a_sort[$primary_key]] as $key=>$value)
+		foreach ($dummy[$a_sort[$primary_key]] as $key => $value)
 		{
-			foreach ($dummy[$a_sort[$primary_key]] as $key2=>$value2)
+			foreach ($dummy[$a_sort[$primary_key]] as $key2 => $value2)
 			{
 				$match = false;
 				if (!$nums)
@@ -1050,7 +1049,7 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 				if ($match)
 				{
 					// We have found two different values, so let's sort whole array
-					foreach ($dummy as $sort_key=>$sort_val)
+					foreach ($dummy as $sort_key => $sort_val)
 					{
 						$t                       = $dummy[$sort_key][$key];
 						$dummy[$sort_key][$key]  = $dummy[$sort_key][$key2];
@@ -1091,16 +1090,16 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 	case "day": // Day
 		for ($idx = 1; $idx < 32; $idx++)
 		{
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "month": // Month
-		foreach ($MONTH_DESCR as $month=>$descr)
+		foreach ($MONTH_DESCR as $month => $descr)
 		{
-			$OUT .= "      <OPTION value=\"".$month."\"";
+			$OUT .= "<OPTION value=\"".$month."\"";
 			if ($DEFAULT == $month) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$descr."</OPTION>\n";
 		}
@@ -1115,7 +1114,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 		{
 			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\"";
+				$OUT .= "<OPTION value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
@@ -1125,17 +1124,17 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 			// Current year minus 1
 			for ($idx = 2003; $idx <= ($YEAR + 1); $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
+				$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";
+			$OUT .= "<OPTION value=\"1929\">&lt;1930</OPTION>\n";
 			$YEAR = date('Y', time()) - 16;
 			for ($idx = 1930; $idx <= $YEAR; $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\"";
+				$OUT .= "<OPTION value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
@@ -1144,30 +1143,27 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 
 	case "sec":
 	case "min":
-		for ($idx = 0; $idx < 60; $idx+=5)
-		{
+		for ($idx = 0; $idx < 60; $idx+=5) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "hour":
-		for ($idx = 0; $idx < 24; $idx++)
-		{
+		for ($idx = 0; $idx < 24; $idx++) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "yn":
-		$OUT .= "      <OPTION value=\"Y\"";
+		$OUT .= "<OPTION value=\"Y\"";
 		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".YES."</OPTION>
-			<OPTION value=\"N\"";
+		$OUT .= ">".YES."</OPTION>\n<OPTION value=\"N\"";
 		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
 		$OUT .= ">".NO."</OPTION>\n";
 		break;
@@ -1255,42 +1251,34 @@ function bigintval($num, $castValue = true) {
 // Insert the code in $img_code into jpeg or PNG image
 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)) || ($_CONFIG['code_length'] == 0)) {
 		// Stop execution of function here because of over-sized code length
 		return;
-	}
-	 elseif (!$header)
-	{
+	} elseif (!$header) {
 		// Return in an HTML code code
 		return "<IMG src=\"".URL."/img.php?code=".$img_code."\">\n";
 	}
 
-	switch ($_CONFIG['img_type'])
-	{
-	case "jpg":
-		// Loads JPEG image
-		$img = sprintf("%s/theme/%s/images/code_bg.jpg", PATH, GET_CURR_THEME());
-		if ((file_exists($img)) && (is_readable($img))) {
+	// Load image
+	$img = sprintf("%s/theme/%s/images/code_bg.%s", PATH, GET_CURR_THEME(), $_CONFIG['img_type']);
+	if (FILE_READABLE($img)) {
+		// Switch image type
+		switch ($_CONFIG['img_type'])
+		{
+		case "jpg":
 			// Okay, load image and hide all errors
 			$image = @imagecreatefromjpeg($img);
-		} else 	{
-			// Exit function here
-			return;
-		}
-		break;
+			break;
 
-	case "png":
-		// Loads PNG image
-		$img = sprintf("%s/theme/%s/images/code_bg.png", PATH, GET_CURR_THEME());
-		if ((file_exists($img)) && (is_readable($img))) {
+		case "png":
 			// Okay, load image and hide all errors
 			$image = @imagecreatefrompng($img);
-		} else {
-			// Exit function here
-			return;
+			break;
 		}
-		break;
+	} else {
+		// Exit function here
+		return;
 	}
 
 	// Generate text color (red/green/blue; 0 = dark, 255 = bright)
@@ -1311,17 +1299,20 @@ function GENERATE_IMAGE($img_code, $header=true) {
 	// Remove image from memory
 	imagedestroy($image);
 }
-function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false)
-{
+// Create selection box or array of splitted timestamp
+function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
 	// Calculate 15-seconds timestamp (15-seconds-steps shall be fine ;) )
 	$timestamp = round($timestamp / 15) * 15;
+
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
 	$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 = ONE_DAY;
+
 	// First of all years...
 	$Y = abs(floor($timestamp / (31536000 + $SWITCH)));
 	// Next months...
@@ -1336,11 +1327,11 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 	$m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 60 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
 	// And at last seconds...
 	$s = abs(floor($timestamp - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+
 	//
 	// Now we convert them in seconds...
 	//
-	if ($return_array)
-	{
+	if ($return_array) {
 		// Just put all data in an array for later use
 		$OUT = array(
 			'YEARS'   => $Y,
@@ -1351,61 +1342,57 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 			'MINUTES' => $m,
 			'SECONDS' => $s
 		);
-	}
-	 else
-	{
+	} else {
 		// Generate table
 		$OUT  = "<DIV align=\"".$align."\">\n";
 		$OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
 		$OUT .= "<TR>\n";
-		if (ereg('Y', $display) || (empty($display)))
-		{
+
+		if (ereg('Y', $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._YEARS."</STRONG></TD>\n";
 		}
-		if (ereg("M", $display) || (empty($display)))
-		{
+
+		if (ereg("M", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MONTHS."</STRONG></TD>\n";
 		}
-		if (ereg("W", $display) || (empty($display)))
-		{
+
+		if (ereg("W", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._WEEKS."</STRONG></TD>\n";
 		}
-		if (ereg("D", $display) || (empty($display)))
-		{
+
+		if (ereg("D", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._DAYS."</STRONG></TD>\n";
 		}
-		if (ereg("h", $display) || (empty($display)))
-		{
+
+		if (ereg("h", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG 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\"><STRONG class=\"tiny\">"._MINUTES."</STRONG></TD>\n";
 		}
-		if (ereg("s", $display) || (empty($display)))
-		{
+
+		if (ereg("s", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._SECONDS."</STRONG></TD>\n";
 		}
+
 		$OUT .= "</TR>\n";
 		$OUT .= "<TR>\n";
-		if (ereg('Y', $display) || (empty($display)))
-		{
+
+		if (ereg('Y', $display) || (empty($display))) {
 			// Generate year selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 10; $idx++)
-			{
+			for ($idx = 0; $idx <= 10; $idx++) {
 				$OUT .= "    <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $Y) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\">\n";
 		}
-		if (ereg("M", $display) || (empty($display)))
-		{
+
+		if (ereg("M", $display) || (empty($display))) {
 			// Generate month selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 11; $idx++)
@@ -1415,89 +1402,72 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\">\n";
 		}
-		if (ereg("W", $display) || (empty($display)))
-		{
+
+		if (ereg("W", $display) || (empty($display))) {
 			// Generate week selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 4; $idx++)
-			{
+			for ($idx = 0; $idx <= 4; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $W) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\">\n";
 		}
-		if (ereg("D", $display) || (empty($display)))
-		{
+
+		if (ereg("D", $display) || (empty($display))) {
 			// Generate day selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 31; $idx++)
-			{
+			for ($idx = 0; $idx <= 31; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $D) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_da\" value=\"0\">\n";
 		}
-		if (ereg("h", $display) || (empty($display)))
-		{
+
+		if (ereg("h", $display) || (empty($display))) {
 			// Generate hour selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 23; $idx++)
-			{
+			for ($idx = 0; $idx <= 23; $idx++) 	{
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $h) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$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++)
-			{
+			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $m) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mi\" value=\"0\">\n";
 		}
-		if (ereg("s", $display) || (empty($display)))
-		{
+
+		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 <= 45; $idx += 15) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $s) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_se\" value=\"0\">\n";
 		}
 		$OUT .= "</TR>\n";
@@ -1509,7 +1479,8 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 }
 //
 function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
-	$ret = "0";
+	$ret = 0;
+
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
@@ -1592,7 +1563,7 @@ function CREATE_FANCY_TIME($stamp) {
 	// Get data array with years/months/weeks/days/...
 	$data = CREATE_TIME_SELECTIONS($stamp, "", "", "", true);
 	$ret = "";
-	foreach($data as $k=>$v) {
+	foreach($data as $k => $v) {
 		if ($v > 0) {
 			// Value is greater than 0 "eval" data to return string
 			$eval = "\$ret .= \", \".\$v.\" \"._".strtoupper($k).";";
@@ -1662,25 +1633,12 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
 	}
 }
 
-//
-function MXCHANGE_OPEN ($script) {
-	global $_CONFIG;
-	// Default is not to use proxy
-	$useProxy = true;
-
-	// Are proxy settins set?
-	if ((!empty($_CONFIG['proxy_host'])) && ($_CONFIG['proxy_port'] > 0)) {
-		// Then use it
-		$useProxy = true;
-	}
-
-	//* DEBUG */ print("SCRIPT=".$script."<br />\n");
-	// Compile the script name
-	$script = COMPILE_CODE($script);
-	//* DEBUG */ print("SCRIPT=".$script."<br />\n");
-
+// 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);
@@ -1706,6 +1664,85 @@ function MXCHANGE_OPEN ($script) {
 	//* DEBUG */ print("SCRIPT=".$script."<br />\n");
 	if (substr($script, 0, 1) == "/") $script = substr($script, 1);
 
+	// 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
+
+	// 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("", "", "");
+
+	// 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) {
@@ -1717,33 +1754,33 @@ function MXCHANGE_OPEN ($script) {
 	// Is there a link?
 	if (!is_resource($fp)) {
 		// Failed!
-		return array("", "", "");
+		return $response;
 	} // END - if
 
 	// Do we use proxy?
 	if ($useProxy) {
 		// Generate CONNECT request header
-		$request  = "CONNECT ".$host.":80 HTTP/1.1\r\n";
-		$request .= "Host: ".$host."\r\n";
+		$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']));
-			$request .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
+			$proxyTunnel .= "Proxy-Authorization: Basic ".$encodedAuth."\r\n";
 		} // END - if
 
 		// Add last new-line
-		$request .= "\r\n";
-		//* DEBUG: */ print("<strong>Request:</strong><pre>".$request."</pre>");
+		$proxyTunnel .= "\r\n";
+		//* DEBUG: */ print("<strong>proxyTunnel=</strong><pre>".$proxyTunnel."</pre>");
 
 		// Write request
-		fputs($fp, $request);
+		fputs($fp, $proxyTunnel);
 
 		// Got response?
 		if (feof($fp)) {
 			// No response received
-			return array("", "", "");
+			return $response;
 		} // END - if
 
 		// Read the first line
@@ -1751,22 +1788,9 @@ function MXCHANGE_OPEN ($script) {
 		$respArray = explode(" ", $resp);
 		if ((strtolower($respArray[0]) !== "http/1.0") || ($respArray[1] != "200")) {
 			// Invalid response!
-			return array("", "", "");
+			return $response;
 		} // END - if
 	} // END - if
-	
-	// 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";
-	//* DEBUG: */ print("<strong>Request:</strong><pre>".$request."</pre>");
-
-	// Initialize array
-	$response = array();
 
 	// Write request
 	fputs($fp, $request);
@@ -1779,6 +1803,22 @@ function MXCHANGE_OPEN ($script) {
 	// 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?
@@ -1977,15 +2017,14 @@ function scrambleString($str) {
 
 		// Add it to final output string
 		$scrambled .= $char;
-	}
+	} // END - for
 
 	// Return scrambled string
 	//* DEBUG: */ echo "***Scrambled=".$scrambled."***<br />";
 	return $scrambled;
 }
 //
-function descrambleString($str)
-{
+function descrambleString($str) {
 	global $_CONFIG;
 	// Scramble only 40 chars long strings
 	if (strlen($str) != 40) return $str;
@@ -1999,11 +2038,10 @@ function descrambleString($str)
 	// Begin descrambling
 	$orig = str_repeat(" ", 40);
 	//* DEBUG: */ echo "+++Scrambled=".$str."+++<br />";
-	for ($idx = 0; $idx < 40; $idx++)
-	{
+	for ($idx = 0; $idx < 40; $idx++) {
 		$char = substr($str, $idx, 1);
 		$orig = substr_replace($orig, $char, $scrambleNums[$idx], 1);
-	}
+	} // END - for
 
 	// Return scrambled string
 	//* DEBUG: */ echo "+++Original=".$orig."+++<br />";
@@ -2023,11 +2061,11 @@ function genScrambleString($len) {
 		// Check for it by creating more numbers
 		while (array_key_exists($rand, $scrambleNumbers)) {
 			$rand = mt_rand(0, ($len -1));
-		}
+		} // END - while
 
 		// Add number
 		$scrambleNumbers[$rand] = $rand;
-	}
+	} // END - for
 
 	// So let's create the string for storing it in database
 	$scrambleString = implode(":", $scrambleNumbers);
@@ -2035,8 +2073,7 @@ function genScrambleString($len) {
 }
 // Append data like session ID referral ID to the given URL which would
 // normally be stored in cookies
-function ADD_URL_DATA($URL)
-{
+function ADD_URL_DATA($URL) {
 	global $_CONFIG;
 	$ADD = "";
 
@@ -2065,7 +2102,7 @@ function ADD_URL_DATA($URL)
 			// Add current session
 			$ADD .= $BIND."PHPSESSID=".session_id();
 		}
-	}
+	} // END - if
 
 	// Add all together and return it
 	return $URL.$ADD;
@@ -2121,8 +2158,8 @@ function FIX_DELETED_COOKIES ($cookies) {
 			if (get_session($cookieName) == "deleted") {
 				set_session($cookieName, "");
 			}
-		}
-	}
+		} // END - foreach
+	} // END - if
 }
 
 // Output error messages in a fasioned way and die...
@@ -2224,7 +2261,7 @@ function get_session($var) {
 	if (isSessionVariableSet($var)) {
 		// Then  get it secured!
 		$value = SQL_ESCAPE($_SESSION[$var]);
-	}
+	} // END - if
 
 	// Return the value
 	return $value;
@@ -2271,6 +2308,153 @@ function DEBUG_LOG ($message) {
 		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;
+
+	// 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 = 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
+
+	// Return array
+	return $INC_POOL;
+}
+// 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)) {
+		// Does the filter function exist?
+		if (function_exists($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($value), $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
+	} // END - if
+
+	// Return the value
+	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) {
+	// Init test variable
+	$TEST2 = "";
+
+	// Get last three chars
+	$TEST = substr($id, -3);
+
+	// Improved way of checking! :-)
+	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)) {
+			// Generate timestamp
+			$POST[$TEST] = CREATE_TIMESTAMP_FROM_SELECTIONS($TEST, $POST);
+			$DATA[] = "$TEST='".$POST[$TEST]."'";
+
+			// Remove data from array
+			foreach (array("ye", "mo", "we", "da", "ho", "mi", "se") as $rem) {
+				unset($POST[$TEST."_".$rem]);
+			} // END - foreach
+
+			// Skip adding
+			unset($id); $skip = true; $TEST2 = $TEST;
+		} // END - if
+	} else {
+		// Process this entry
+		$skip = false; $TEST2 = "";
+	}
+}
+// Reverts the german decimal comma into Computer decimal dot
+function REVERT_COMMA ($str) {
+	$float = (float)str_replace(",", ".", $str);
+	return $float;
+}
 //
 //////////////////////////////////////////////////
 //                                              //
@@ -2285,7 +2469,7 @@ if (!function_exists('html_entity_decode')) {
 		$trans_tbl = array_flip($trans_tbl);
 		return strtr($string, $trans_tbl);
 	}
-}
+} // END - if
 
 //
 ?>