X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=8915f0fe47a027e6dde8a47f4d12e61abb02436c;hb=e19231f39d9d6583cc5753dbd2638c597957fdd1;hp=f077b9ba45c0bd1f0331982ca411c3fb3679974f;hpb=964a3b539e335f6d70e7779630fd3d25fd38398d;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index f077b9ba45..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;
}
@@ -59,7 +59,8 @@ function checkHtmlTags ($html) {
$check = str_replace('/', '', $check);
if (!in_array($check, $GLOBALS['html_tags'])) {
// Invalid tag found
- return '';
+ $html = '';
+ break;
} // END - if
$test = substr($test, strpos($test, '>') + 1);
} // END - while
@@ -82,7 +83,7 @@ function insertUrlsIntoHtml ($text) {
} // END - foreach
// Now replace the URL against anchor container and pray...
- $text = substr($text, 0, strpos($text, $check2)) . '' . $check . '' . substr($text, strpos($text, $check2) + strlen($check));
+ $text = substr($text, 0, strpos($text, $check2)) . '' . $check . '' . 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));
@@ -118,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 != '@')) {
@@ -134,20 +135,21 @@ function insertUrlsIntoHtml ($text) {
} // END - if
// Now replace the email against anchor with mailto and pray...
- $PARTS[] = $check2 . '' . $check . '';
+ array_push($PARTS, $check2 . '' . $check . '');
// 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
-s and finally compile possible own HTML tags out...
- return preCompileCode(str_replace("\n", "
\n", $text));
+ return preCompileCode(str_replace(PHP_EOL, '
' . PHP_EOL, $text));
}
// [EOF]