X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=e891c061bc59483ddbf8484b5f9903a1cc0f25d1;hp=a3c176691d83517535fe8fcd521cb4f4a559770b;hb=99966a712b3b3d8b521524762e153353d1d20bd4;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index a3c176691d..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 *
@@ -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;
}
@@ -56,15 +54,17 @@ function addValidHtmlTags() {
//
function checkHtmlTags ($html) {
$test = stripslashes($html);
- while (ereg('<', $test) && ereg('>', $test)) {
+ while (isInString('<', $test) && isInString('>', $test)) {
$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;
}
@@ -74,16 +74,16 @@ function insertUrlsIntoHtml ($text) {
$test = $text;
// First replace URLs...
- while (ereg('http://', $test)) {
+ while (isInString('http://', $test)) {
$check = substr($test, strpos($test, 'http://')); $check2 = $check;
// See ext-html.php if you want to add more URL ends...
foreach ($GLOBALS['url_ends'] as $end) {
- if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
+ if (isInString($end, $check)) $check = substr($check, 0, strpos($check, $end));
} // 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));
@@ -97,7 +97,7 @@ function insertUrlsIntoHtml ($text) {
// ... what will the email address be out the @... ;-)
$PARTS = array();
- while (ereg('@', $test)) {
+ while (isInString('@', $test)) {
$pos = strpos($test, '@');
$test2 = substr($test, 0, $pos);
@@ -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,30 +135,22 @@ 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 compileCode(str_replace("\n", "
\n", $text));
+ return preCompileCode(str_replace(PHP_EOL, '
' . PHP_EOL, $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]
?>