X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=91f9504bcc30d5c87e2c86c8894fd1e4ac43a802;hp=1c3e65772937102c2fa509d3546889d2e6328411;hb=79cab07c8937729e73bfacd4977bd5a203a7d950;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672
diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 1c3e657729..91f9504bcc 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -10,9 +10,14 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Funktionen fuer die HTML-Erweiterung *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -33,64 +38,55 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
- require($INC);
+ die();
}
//
-function HTML_ADD_VALID_TAGS()
-{
- global $HTML_TAGS; $OUT = "";
- if (!is_array($HTML_TAGS)) return "";
- foreach ($HTML_TAGS as $tag)
- {
+function addValidHtmlTags() {
+ $OUT = '';
+ if (!is_array($GLOBALS['html_tags'])) return "";
+ foreach ($GLOBALS['html_tags'] as $tag) {
$OUT .= ", ".strtoupper($tag);
}
$OUT = substr($OUT, 2);
return $OUT;
}
+
//
-function HTML_CHECK_TAGS($html)
-{
- global $HTML_TAGS;
+function checkHtmlTags ($html) {
$test = stripslashes($html);
- 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, $HTML_TAGS))
- {
+ 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 "";
}
- $test = substr($test, strpos($test, ">") + 1);
+ $test = substr($test, strpos($test, '>') + 1);
}
// 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 (ereg('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)
- {
+ 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
@@ -100,73 +96,68 @@ 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
$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))
- {
+ $idx = '0';
+ 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."";
+ $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 compileCode(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
}
+
//
?>