X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=e891c061bc59483ddbf8484b5f9903a1cc0f25d1;hb=ab5ff5126ef56b08f5130a9e110b53c00d0a2761;hp=6234dafc6c1534cb07fc9f2b199a0e8a53ff6590;hpb=803b63e8ceff7392a9eae4992dd6e59c1da247cd;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 6234dafc6c..e891c061bc 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 - 2013 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 *
@@ -47,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;
}
@@ -60,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;
}
@@ -83,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));
@@ -119,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 != '@')) {
@@ -135,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]