X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=62bc294d941e195bd9e7668648062492b832de36;hb=1d3a8dd214123328e25d61efe5c0614e0f8737fe;hp=ee0f7bde321cda3d1dce7073f6c4a598b57e2a7a;hpb=3f51c40f4fede87228216f9285b745a339e3891d;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index ee0f7bde32..62bc294d94 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 "";
- }
+ // Invalid tag found
+ return '';
+ } // END - if
$test = substr($test, strpos($test, '>') + 1);
- }
+ } // END - while
+
// Return tested code
return $html;
}
+
//
-function HTML_INSERT_URLS ($text) {
+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));
@@ -95,7 +96,7 @@ function HTML_INSERT_URLS ($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);
@@ -133,30 +134,22 @@ function HTML_INSERT_URLS ($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 COMPILE_CODE(str_replace("\n", "
\n", $text));
-}
-
-// Sends a HTML mail to the user
-function sendHtmlEmail($to, $subject, $message, $FROM) {
- if (EXT_IS_ACTIVE('html_mail')) {
- // Send mail away as HTML
- $FROM = "Content-Type: text/html\n" . $FROM;
- sendEmail($to, $subject, $message, 'N', $FROM);
- }
+ return preCompileCode(str_replace(PHP_EOL, '
' . PHP_EOL, $text));
}
-//
+// [EOF]
?>