X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=4e0169b3e083be71cb0d7f008e8e082e1c9a90fa;hp=f72b7d595579a5248d9aef1ca2e9daedb2226bf8;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index f72b7d5955..4e0169b3e0 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!
- return "";
+ return '';
}
$test = substr($test, strpos($test, '>') + 1);
}
@@ -73,16 +72,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 +95,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);
@@ -118,7 +117,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,7 +133,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));
@@ -144,20 +143,11 @@ function insertUrlsIntoHtml ($text) {
$text = ''; $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));
-}
-
-// 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);
- }
+ return preCompileCode(str_replace("\n", "
\n", $text));
}
-//
+// [EOF]
?>