X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=640ff9df0f317ec2310b2cfdb3b429cf48b0cd89;hp=7462021a9d7bae989751a6eaee7f8b8ec45c0d61;hb=c47293f5523a4a9e8791f0922b138fa6865aefaf;hpb=3299d3eba008bfd2450d0f19d072126f98c78e1e

diff --git a/inc/functions.php b/inc/functions.php
index 7462021a9d..640ff9df0f 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);
 }
 
@@ -140,7 +140,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 		while (strpos($OUTPUT, '{!') > 0) {
 			// Prepare the content and eval() it...
 			$newContent = "";
-			$eval = "\$newContent = \"" . COMPILE_CODE(addslashes($OUTPUT)) . "\";";
+			$eval = "\$newContent = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
 			@eval($eval);
 
 			if (empty($newContent)) {
@@ -160,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);
 		}
 
@@ -209,9 +209,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);
@@ -222,7 +223,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
@@ -291,7 +292,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 		// Do we have to compile the code?
 		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
@@ -331,7 +332,7 @@ 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);
 
@@ -342,7 +343,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") {
 			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);
 		}
@@ -368,7 +369,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>
@@ -377,7 +378,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)) {
@@ -386,7 +387,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);
 	}
@@ -410,7 +411,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;
@@ -418,7 +419,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)) {
@@ -503,8 +508,7 @@ 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";
@@ -561,7 +565,7 @@ function TRANSLATE_COMMA($dotted, $cut=true)
 
 //
 function DEREFERER($URL) {
-	$URL = URL."/modules.php?module=loader&amp;url=".urlencode(base64_encode(COMPILE_CODE($URL)));
+	$URL = URL."/modules.php?module=loader&amp;url=".urlencode(base64_encode(gzcompress(COMPILE_CODE($URL))));
 	return $URL;
 }
 
@@ -577,8 +581,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;
@@ -592,33 +595,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":
@@ -684,7 +684,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 
 	// 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');
@@ -711,6 +711,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
@@ -808,13 +809,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);
@@ -822,7 +823,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 		}
 	} else {
 		// Neutral sex and email address is default
-		$sex = 'N';
+		$sex = "N";
 		$email = WEBMASTER;
 	}
 
@@ -833,7 +834,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) {
@@ -861,11 +862,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);
@@ -879,9 +879,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."
@@ -892,17 +890,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);
@@ -942,6 +939,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
@@ -1162,10 +1164,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;
 	}
@@ -1187,15 +1189,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;
@@ -1211,11 +1219,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();
+	} 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, strlen($_CONFIG['master_salt']), 9)) / abs(_MAX - $a + sqrt(_ADD)) / pi();
+		// 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'];
@@ -1228,20 +1244,15 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
 	return $return;
 }
 // Does only allow numbers
-function bigintval($num, $castValue = true)
-{
+function bigintval($num, $castValue = true) {
 	// Filter all numbers out
 	$ret = preg_replace("/[^0123456789]/", "", $num);
 
-	// Cast the value?
-	if ($castValue) $ret = (int) $ret;
-
 	// 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))
 	{
@@ -1258,14 +1269,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;
 		}
@@ -1273,14 +1281,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;
 		}
@@ -1297,8 +1302,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;
 	}
@@ -1379,7 +1383,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";
@@ -1529,7 +1533,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);
 
@@ -1783,7 +1788,7 @@ function MXCHANGE_OPEN ($script) {
 	} // 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
@@ -1858,7 +1863,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 	}
 
 	// Finish navigation link
-	$eval = substr($eval, 0, -7) . "]\";";
+	$eval = substr($eval, 0, -7)."]\";";
 	eval($eval);
 
 	// Return string
@@ -1896,11 +1901,19 @@ function CREATE_EMAIL_LINK($email, $table="admins") {
 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 == "") {
@@ -1927,14 +1940,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) {
@@ -2056,7 +2069,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;
 
@@ -2081,10 +2094,11 @@ 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";
@@ -2095,6 +2109,7 @@ function generatePassString($passHash) {
 	// Return result
 	return $ret;
 }
+
 // Fix "deleted" cookies
 function FIX_DELETED_COOKIES ($cookies) {
 	// Is this an array with entries?
@@ -2108,6 +2123,7 @@ function FIX_DELETED_COOKIES ($cookies) {
 		}
 	}
 }
+
 // Output error messages in a fasioned way and die...
 function mxchange_die ($msg) {
 	global $footer;
@@ -2175,6 +2191,9 @@ function set_session ($var, $value) {
 	} 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.
@@ -2182,6 +2201,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
@@ -2194,7 +2214,6 @@ 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) {
 	// Default is not found! ;-)
@@ -2209,7 +2228,38 @@ function get_session($var) {
 	// 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>");
+}
 //
 //////////////////////////////////////////////////
 //                                              //