X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fhtml_mail_functions.php;h=0ca2f48b0402d0357f9cfcb221930476f9afce82;hb=5736dfb1b51bff78b3594a166f350e76784fa0ff;hp=1b1027654f6f085469b1bad59aceed0e4e22b7b9;hpb=21a24662ddc70624c27c607e3904aab23e893898;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 1b1027654f..0ca2f48b04 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -1,7 +1,7 @@
", $test)) {
- $check = strtolower(substr($test, strpos($test, "<") + 1, strpos($test, ">") - strpos($test, "<") - 1));
- $check = str_replace("/", "", $check);
+ 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);
+ $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 (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));
- }
+ foreach ($GLOBALS['url_ends'] as $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));
- }
+ } // END - while
// Now do the (nearly) same thing with email addresses
// but now we have the problem that email addresses didn't have
@@ -97,73 +97,68 @@ function HTML_INSERT_URLS ($text) {
// ... what will the email address be out the @... ;-)
$PARTS = array();
- while (ereg("@", $test))
- {
- $pos = strpos($test, "@");
+ while (isInString('@', $test)) {
+ $pos = strpos($test, '@');
$test2 = substr($test, 0, $pos);
// First check backwards
$idx = $pos - 1;
- while ($idx > 0)
- {
+ while ($idx > 0) {
$check = substr($test2, $idx, 1);
- if (!in_array($check, $GLOBALS['valid_email_chars']))
- {
+ if (!in_array($check, $GLOBALS['valid_email_chars'])) {
// Char found so we end here
break;
- }
+ } // END - if
$idx--;
- }
- if ($idx > 0)
- {
+ } // 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;
- while ($idx < strlen($test))
- {
+ $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++;
- }
- if ($idx > 0)
- {
+ } // 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));
}
+
// Now put all parts together
- $text = ""; $PARTS[] = $test;
- foreach ($PARTS as $part)
- {
+ $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 preCompileCode(str_replace("\n", "
\n", $text));
}
-//
-function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
-{
- if (EXT_IS_ACTIVE("html_mail"))
- {
+
+// 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\n".$FROM;
- SEND_EMAIL($TO, $SUBJECT, $MSG, 'N', $FROM);
- }
+ $FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
+ sendEmail($to, $subject, $message, 'N', $FROM);
+ } // END - if
}
+
//
?>