X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=c8db16ae1b0c760084e77d1f6a8d25f272b18cce;hb=4cf6094cc3cbebfda691fa797e00fe674bbb329c;hp=29f49585d1470d3b9f2d1b2084f604e4356d9d60;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 29f49585d1..c8db16ae1b 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -1,7 +1,7 @@
', $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!
+ // Invalid tag found
return '';
- }
+ } // END - if
$test = substr($test, strpos($test, '>') + 1);
- }
+ } // END - while
+
// Return tested code
return $html;
}
@@ -73,16 +73,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));
@@ -96,7 +96,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);
@@ -134,7 +134,7 @@ function insertUrlsIntoHtml ($text) {
} // END - if
// Now replace the email against anchor with mailto and pray...
- $PARTS[] = $check2 . "" . $check . "";
+ $PARTS[] = $check2 . '' . $check . '';
// Remove email from testing string (see above why...)
$test = substr($test, strlen($check));
@@ -147,17 +147,8 @@ function insertUrlsIntoHtml ($text) {
} // END - foreach
// Replace new-lines agains
-s and finally compile possible own HTML tags out...
- return compileCode(str_replace("\n", "
\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
+ return preCompileCode(str_replace("\n", "
\n", $text));
}
-//
+// [EOF]
?>