X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=8915f0fe47a027e6dde8a47f4d12e61abb02436c;hb=e19231f39d9d6583cc5753dbd2638c597957fdd1;hp=4e0169b3e083be71cb0d7f008e8e082e1c9a90fa;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 4e0169b3e0..8915f0fe47 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 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 *
@@ -45,8 +45,8 @@ 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;
 }
@@ -58,11 +58,13 @@ 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!
-			return '';
-		}
+			// Invalid tag found
+			$html = '';
+			break;
+		} // END - if
 		$test = substr($test, strpos($test, '>') + 1);
-	}
+	} // END - while
+
 	// Return tested code
 	return $html;
 }
@@ -81,7 +83,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));
@@ -117,7 +119,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 != '@')) {
@@ -133,20 +135,21 @@ 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 preCompileCode(str_replace("\n", "<br />\n", $text));
+	return preCompileCode(str_replace(PHP_EOL, '<br />' . PHP_EOL, $text));
 }
 
 // [EOF]