X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=62c13a1a9bb0409721159789f0e129c2850a2f84;hb=f2edf32502b2774dc17ef419a2e6a1c60e361c0a;hp=8630b681283b234c2360fbad7e3ad5608b00d92c;hpb=5c299c999d8b5106dc007dea5317bbb9209e829f;p=mailer.git

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 8630b68128..62c13a1a9b 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -40,15 +38,15 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 //
 function addValidHtmlTags() {
 	$OUT = '';
 	if (!is_array($GLOBALS['html_tags'])) return "";
 	foreach ($GLOBALS['html_tags'] as $tag) {
-		$OUT .= ", ".strtoupper($tag);
-	}
+		$OUT .= ', ' . strtolower($tag);
+	} // END - foreach
 	$OUT = substr($OUT, 2);
 	return $OUT;
 }
@@ -60,11 +58,12 @@ function checkHtmlTags ($html) {
 		$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!
+			// Invalid tag found
 			return '';
-		}
+		} // END - if
 		$test = substr($test, strpos($test, '>') + 1);
-	}
+	} // END - while
+
 	// Return tested code
 	return $html;
 }
@@ -83,7 +82,7 @@ function insertUrlsIntoHtml ($text) {
 		} // END - foreach
 
 		// Now replace the URL against anchor container and pray...
-		$text = substr($text, 0, strpos($text, $check2)) . '<a href="' . generateDerefererUrl($check) . '" target="_blank">' . $check . '</a>' . substr($text, strpos($text, $check2) + strlen($check));
+		$text = substr($text, 0, strpos($text, $check2)) . '<a href="' . generateDereferrerUrl($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));
@@ -119,7 +118,7 @@ function insertUrlsIntoHtml ($text) {
 		} // END - if
 
 		// And now go forward...
-		$idx = '0';
+		$idx = 0;
 		while ($idx < strlen($test)) {
 			$check = substr($test, $idx, 1);
 			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
@@ -135,30 +134,22 @@ function insertUrlsIntoHtml ($text) {
 		} // END - if
 
 		// Now replace the email against anchor with mailto and pray...
-		$PARTS[] = $check2 . '<a href="' . generateEmailLink($check, 'user_data') . '">' . $check . '</a>';
+		array_push($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;
+	$text = '';
+	array_push($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 compileCode(str_replace("\n", "<br />\n", $text));
+	return preCompileCode(str_replace(chr(10), "<br />\n", $text));
 }
 
-// Sends a HTML mail to the user
-function sendHtmlEmail($to, $subject, $message, $FROM) {
-	if (isExtensionActive('html_mail')) {
-		// Send mail away as HTML
-		$FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
-		sendEmail($to, $subject, $message, 'N', $FROM);
-	} // END - if
-}
-
-//
+// [EOF]
 ?>