X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=0ca2f48b0402d0357f9cfcb221930476f9afce82;hb=a443166d3f417109c905dc399ee7149ca4de6319;hp=f7a34e0298c62265c4641fb115faea5957fa0644;hpb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index f7a34e0298..0ca2f48b04 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -18,6 +18,7 @@
* 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 *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -55,7 +56,7 @@ 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'])) {
@@ -73,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));
@@ -96,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);
@@ -134,7 +135,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,7 +148,7 @@ 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));
+ return preCompileCode(str_replace("\n", "
\n", $text));
}
// Sends a HTML mail to the user