X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=b9369d3ebcfab2aa0a985c25b2c9059783eebd21;hb=62c27b6be1b4edfe53d60b54c06621dbc7b30686;hp=d356add7d7f8d942edaad8693aad4c6faa212514;hpb=7f104f6fe558bb56b4205241435a2357c2feece1;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index d356add7d7..b9369d3ebc 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -474,7 +474,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
 			$mail->WordWrap   = 70;
 			$mail->IsHTML(true);
 		} else {
-			$mail->Body       = $msg;
+			$mail->Body       = html_entity_decode($msg);
 		}
 		$mail->AddAddress($to, "");
 		$mail->AddReplyTo(WEBMASTER,MAIN_TITLE);
@@ -483,7 +483,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
 		$mail->Send();
 	} else {
 		// Use legacy mail() command
-		@mail($to, $subject, $msg, $from);
+		@mail($to, $subject, html_entity_decode($msg), $from);
 	}
 }
 //
@@ -591,7 +591,13 @@ function TRANSLATE_COMMA ($dotted, $cut=true) {
 
 //
 function DEREFERER ($URL) {
-	$URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL)));
+	// Don't de-refer our own links!
+	if (substr($URL, 0, strlen(URL)) != URL) {
+		// De-refer this link
+		$URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL)));
+	} // END - if
+
+	// Return link
 	return $URL;
 }
 
@@ -908,11 +914,8 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
 	global $SEC_CHARS, $URL_CHARS;
 	// Is the code a string?
 	if (!is_string($code)) {
-		// Abort here with backtrace
-		DEBUG_LOG(__FUNCTION__.": code is not string!");
-		print "<pre>";
-		debug_print_backtrace();
-		die("</pre>");
+		// Silently return it
+		return $code;
 	} // END - if
 
 	$ARRAY = $SEC_CHARS;
@@ -1288,7 +1291,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 	global $_CONFIG;
 
 	// Calculate 2-seconds timestamp
-	$stamp = round($timestamp / 2) * 2;
+	$stamp = round($timestamp);
 
 	// Do we have a leap year?
 	$SWITCH = 0;