Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[mailer.git] / inc / libs / html_mail_functions.php

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index ee0f7bde321cda3d1dce7073f6c4a598b57e2a7a..f72b7d595579a5248d9aef1ca2e9daedb2226bf8 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -38,12 +38,11 @@
 
 // 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() {
+function addValidHtmlTags() {
        $OUT = '';
        if (!is_array($GLOBALS['html_tags'])) return "";
        foreach ($GLOBALS['html_tags'] as $tag) {
@@ -52,8 +51,9 @@ function HTML_ADD_VALID_TAGS() {
        $OUT = substr($OUT, 2);
        return $OUT;
 }
+
 //
-function HTML_CHECK_TAGS ($html) {
+function checkHtmlTags ($html) {
        $test = stripslashes($html);
        while (ereg('<', $test) && ereg('>', $test)) {
                $check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
@@ -67,8 +67,9 @@ function HTML_CHECK_TAGS ($html) {
        // Return tested code
        return $html;
 }
+
 //
-function HTML_INSERT_URLS ($text) {
+function insertUrlsIntoHtml ($text) {
        $test = $text;
 
        // First replace URLs...
@@ -81,7 +82,7 @@ function HTML_INSERT_URLS ($text) {
                } // END - foreach
 
                // Now replace the URL against anchor container and pray...
-               $text = substr($text, 0, strpos($text, $check2))."<a href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</a>".substr($text, strpos($text, $check2) + strlen($check));
+               $text = substr($text, 0, strpos($text, $check2))."<a href=\"".generateDerefererUrl($check)."\" target=\"_blank\">".$check."</a>".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));
@@ -146,14 +147,14 @@ function HTML_INSERT_URLS ($text) {
        }
 
        // Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
-       return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
+       return compileCode(str_replace("\n", "<br />\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);
        }
 }