X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=8915f0fe47a027e6dde8a47f4d12e61abb02436c;hb=e19231f39d9d6583cc5753dbd2638c597957fdd1;hp=ce48a033e29bffa47376def25142399d1f0f3647;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index ce48a033e2..8915f0fe47 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);
- if (!in_array($check, $HTML_TAGS))
- {
- // Invalid tag found!
- return "";
- }
- $test = substr($test, strpos($test, ">") + 1);
- }
+ 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
+ $html = '';
+ break;
+ } // END - if
+ $test = substr($test, strpos($test, '>') + 1);
+ } // END - while
+
// Return tested code
return $html;
}
+
//
-function HTML_INSERT_URLS($text)
-{
- global $URL_ENDS, $VALID_EMAIL_CHARS;
+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 ($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
@@ -100,73 +97,60 @@ 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, $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))
- {
+ while ($idx < strlen($test)) {
$check = substr($test, $idx, 1);
- if ((!in_array($check, $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."";
+ 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;
- foreach ($PARTS as $part)
- {
+ $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));
+ // Replace new-lines agains
-s and finally compile possible own HTML tags out...
+ return preCompileCode(str_replace(PHP_EOL, '
' . PHP_EOL, $text));
}
-//
-function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
-{
- if (EXT_IS_ACTIVE("html_mail"))
- {
- // Send mail away as HTML
- $FROM = "Content-Type: text/html\n".$FROM;
- SEND_EMAIL($TO, $SUBJECT, $MSG, "N", $FROM);
- }
-}
-//
+
+// [EOF]
?>