X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=6b951f8a00d52f07057f44527b5286727acdbf28;hb=f2736bc6457140146890877d992be862a78b259f;hp=3c4e377e93c30aa227bdfea5a662f38790858ed0;hpb=00797d46cc0b7e2c4e8c084eb4c6ac26cd0336e1;p=mailer.git

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 3c4e377e93..6b951f8a00 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,12 +38,11 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 //
-function HTML_ADD_VALID_TAGS() {
+function addValidHtmlTags() {
 	$OUT = '';
 	if (!is_array($GLOBALS['html_tags'])) return "";
 	foreach ($GLOBALS['html_tags'] as $tag) {
@@ -52,8 +51,9 @@ function HTML_ADD_VALID_TAGS() {
 	$OUT = substr($OUT, 2);
 	return $OUT;
 }
+
 //
-function HTML_CHECK_TAGS ($html) {
+function checkHtmlTags ($html) {
 	$test = stripslashes($html);
 	while (ereg('<', $test) && ereg('>', $test)) {
 		$check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
@@ -67,8 +67,9 @@ function HTML_CHECK_TAGS ($html) {
 	// Return tested code
 	return $html;
 }
+
 //
-function HTML_INSERT_URLS ($text) {
+function insertUrlsIntoHtml ($text) {
 	$test = $text;
 
 	// First replace URLs...
@@ -81,7 +82,7 @@ function HTML_INSERT_URLS ($text) {
 		} // 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));
+		$text = substr($text, 0, strpos($text, $check2))."<a href=\"".generateDerefererUrl($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));
@@ -95,8 +96,8 @@ 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
@@ -106,34 +107,34 @@ function HTML_INSERT_URLS ($text) {
 			if (!in_array($check, $GLOBALS['valid_email_chars'])) {
 				// Char found so we end here
 				break;
-			}
+			} // END - if
 			$idx--;
-		}
+		} // 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)) {
 			$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++;
-		}
+		} // 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));
@@ -143,19 +144,19 @@ function HTML_INSERT_URLS ($text) {
 	$text = ''; $PARTS[] = $test;
 	foreach ($PARTS as $part) {
 		$text .= $part;
-	}
+	} // END - foreach
 
 	// Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
-	return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
+	return compileCode(str_replace("\n", "<br />\n", $text));
 }
 
 // Sends a HTML mail to the user
 function sendHtmlEmail($to, $subject, $message, $FROM) {
-	if (EXT_IS_ACTIVE('html_mail')) {
+	if (isExtensionActive('html_mail')) {
 		// Send mail away as HTML
-		$FROM = "Content-Type: text/html\n" . $FROM;
+		$FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
 		sendEmail($to, $subject, $message, 'N', $FROM);
-	}
+	} // END - if
 }
 
 //