X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=29f49585d1470d3b9f2d1b2084f604e4356d9d60;hb=b1cf96c4a5a63a1d334119a0681e5fbf68edf527;hp=491afda732da7485bc2221496ddfd2da5f163414;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 491afda732..29f49585d1 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -1,6 +1,6 @@
", $test)) {
- $check = strtolower(substr($test, strpos($test, "<") + 1, strpos($test, ">") - strpos($test, "<") - 1));
+ while (ereg('<', $test) && ereg('>', $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);
+ $test = substr($test, strpos($test, '>') + 1);
}
// Return tested code
return $html;
}
+
//
-function HTML_INSERT_URLS ($text) {
+function insertUrlsIntoHtml ($text) {
$test = $text;
// First replace URLs...
- while (ereg("http://", $test))
- {
- $check = substr($test, strpos($test, "http://")); $check2 = $check;
+ while (ereg('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)
- {
+ foreach ($GLOBALS['url_ends'] as $end) {
if (ereg($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));
- }
+ } // END - while
// Now do the (nearly) same thing with email addresses
// but now we have the problem that email addresses didn't have
@@ -97,8 +96,8 @@ function HTML_INSERT_URLS ($text) {
// ... what will the email address be out the @... ;-)
$PARTS = array();
- while (ereg("@", $test)) {
- $pos = strpos($test, "@");
+ while (ereg('@', $test)) {
+ $pos = strpos($test, '@');
$test2 = substr($test, 0, $pos);
// First check backwards
@@ -108,34 +107,34 @@ function HTML_INSERT_URLS ($text) {
if (!in_array($check, $GLOBALS['valid_email_chars'])) {
// Char found so we end here
break;
- }
+ } // END - if
$idx--;
- }
+ } // END - while
if ($idx > 0) {
// Starting mark is found
$check2 = substr($test, 0, ($idx + 1));
$test = substr($test, ($idx + 1));
- }
+ } // 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 != "@")) {
+ if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
// Char found so end here again
break;
- }
+ } // END - if
$idx++;
- }
+ } // END - while
if ($idx > 0) {
// Maybe this is the email address?
$check = substr($test, 0, $idx);
- }
+ } // 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));
@@ -145,19 +144,19 @@ function HTML_INSERT_URLS ($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 COMPILE_CODE(str_replace("\n", "
\n", $text));
+ return compileCode(str_replace("\n", "
\n", $text));
}
// Sends a HTML mail to the user
function sendHtmlEmail($to, $subject, $message, $FROM) {
- if (EXT_IS_ACTIVE('html_mail')) {
+ if (isExtensionActive('html_mail')) {
// Send mail away as HTML
- $FROM = "Content-Type: text/html\n" . $FROM;
+ $FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
sendEmail($to, $subject, $message, 'N', $FROM);
- }
+ } // END - if
}
//