X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=ee0f7bde321cda3d1dce7073f6c4a598b57e2a7a;hp=488c7652940af614c840a50099cf4ae4c162dd41;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 488c765294..ee0f7bde32 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -38,13 +38,13 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$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);
 }
 
 //
 function HTML_ADD_VALID_TAGS() {
-	$OUT = "";
+	$OUT = '';
 	if (!is_array($GLOBALS['html_tags'])) return "";
 	foreach ($GLOBALS['html_tags'] as $tag) {
 		$OUT .= ", ".strtoupper($tag);
@@ -55,14 +55,14 @@ function HTML_ADD_VALID_TAGS() {
 //
 function HTML_CHECK_TAGS ($html) {
 	$test = stripslashes($html);
-	while (ereg("<", $test) && ereg(">", $test)) {
-		$check = strtolower(substr($test, strpos($test, "<") + 1, strpos($test, ">") - strpos($test, "<") - 1));
-		$check = str_replace("/", "", $check);
+	while (ereg('<', $test) && ereg('>', $test)) {
+		$check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
+		$check = str_replace('/', '', $check);
 		if (!in_array($check, $GLOBALS['html_tags'])) {
 			// Invalid tag found!
 			return "";
 		}
-		$test = substr($test, strpos($test, ">") + 1);
+		$test = substr($test, strpos($test, '>') + 1);
 	}
 	// Return tested code
 	return $html;
@@ -72,22 +72,20 @@ function HTML_INSERT_URLS ($text) {
 	$test = $text;
 
 	// First replace URLs...
-	while (ereg("http://", $test))
-	{
-		$check = substr($test, strpos($test, "http://")); $check2 = $check;
+	while (ereg('http://', $test)) {
+		$check = substr($test, strpos($test, 'http://')); $check2 = $check;
 
 		// See ext-html.php if you want to add more URL ends...
-		foreach ($GLOBALS['url_ends'] as $end)
-		{
+		foreach ($GLOBALS['url_ends'] as $end) {
 			if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
-		}
+		} // END - foreach
 
 		// Now replace the URL against anchor container and pray...
 		$text = substr($text, 0, strpos($text, $check2))."<a href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</a>".substr($text, strpos($text, $check2) + strlen($check));
 
 		// Finally remove the url from testing string (or we have a loop and maybe server overload!)
 		$test = substr($test, strpos($test, $check) + strlen($check));
-	}
+	} // END - while
 
 	// Now do the (nearly) same thing with email addresses
 	// but now we have the problem that email addresses didn't have
@@ -97,73 +95,68 @@ function HTML_INSERT_URLS ($text) {
 
 	// ... what will the email address be out the @... ;-)
 	$PARTS = array();
-	while (ereg("@", $test))
-	{
-		$pos = strpos($test, "@");
+	while (ereg('@', $test)) {
+		$pos = strpos($test, '@');
 		$test2 = substr($test, 0, $pos);
 
 		// First check backwards
 		$idx = $pos - 1;
-		while ($idx > 0)
-		{
+		while ($idx > 0) {
 			$check = substr($test2, $idx, 1);
-			if (!in_array($check, $GLOBALS['valid_email_chars']))
-			{
+			if (!in_array($check, $GLOBALS['valid_email_chars'])) {
 				// Char found so we end here
 				break;
-			}
+			} // END - if
 			$idx--;
-		}
-		if ($idx > 0)
-		{
+		} // END - while
+
+		if ($idx > 0) {
 			// Starting mark is found
 			$check2 = substr($test, 0, ($idx + 1));
 			$test = substr($test, ($idx + 1));
-		}
+		} // END - if
 
 		// And now go forward...
 		$idx = 0;
-		while ($idx < strlen($test))
-		{
+		while ($idx < strlen($test)) {
 			$check = substr($test, $idx, 1);
-			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != "@"))
-			{
+			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
 				// Char found so end here again
 				break;
-			}
+			} // END - if
 			$idx++;
-		}
-		if ($idx > 0)
-		{
+		} // END - while
+
+		if ($idx > 0) {
 			// Maybe this is the email address?
 			$check = substr($test, 0, $idx);
-		}
+		} // END - if
 
 		// Now replace the email against anchor with mailto and pray...
-		$PARTS[] = $check2."<a href=\"mailto:".$check."\">".$check."</a>";
+		$PARTS[] = $check2 . "<a href=\"" . generateEmailLink($check, 'user_data') . "\">" . $check . "</a>";
 
 		// Remove email from testing string (see above why...)
 		$test = substr($test, strlen($check));
 	}
+
 	// Now put all parts together
-	$text = ""; $PARTS[] = $test;
-	foreach ($PARTS as $part)
-	{
+	$text = ''; $PARTS[] = $test;
+	foreach ($PARTS as $part) {
 		$text .= $part;
 	}
 
 	// Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
 	return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
 }
-//
-function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
-{
-	if (EXT_IS_ACTIVE("html_mail"))
-	{
+
+// Sends a HTML mail to the user
+function sendHtmlEmail($to, $subject, $message, $FROM) {
+	if (EXT_IS_ACTIVE('html_mail')) {
 		// Send mail away as HTML
-		$FROM = "Content-Type: text/html\n".$FROM;
-		SEND_EMAIL($TO, $SUBJECT, $MSG, 'N', $FROM);
+		$FROM = "Content-Type: text/html\n" . $FROM;
+		sendEmail($to, $subject, $message, 'N', $FROM);
 	}
 }
+
 //
 ?>