More globals rewritten, see #100

[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 1c3e65772937102c2fa509d3546889d2e6328411..236cd6ee6f431ee976165d610a202c1c62f0ca31 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -38,28 +38,22 @@ if (!defined('__SECURITY')) {
 }
 
 //
-function HTML_ADD_VALID_TAGS()
-{
-       global $HTML_TAGS; $OUT = "";
-       if (!is_array($HTML_TAGS)) return "";
-       foreach ($HTML_TAGS as $tag)
-       {
+function HTML_ADD_VALID_TAGS() {
+       $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 HTML_CHECK_TAGS($html {
        $test = stripslashes($html);
-       while (ereg("<", $test) && ereg(">", $test))
-       {
+       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))
-               {
+               if (!in_array($check, $GLOBALS['html_tags'])) {
                        // Invalid tag found!
                        return "";
                }
@@ -69,9 +63,7 @@ function HTML_CHECK_TAGS($html)
        return $html;
 }
 //
-function HTML_INSERT_URLS($text)
-{
-       global $URL_ENDS, $VALID_EMAIL_CHARS;
+function HTML_INSERT_URLS ($text) {
        $test = $text;
 
        // First replace URLs...
@@ -80,7 +72,7 @@ function HTML_INSERT_URLS($text)
                $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));
                }
@@ -110,7 +102,7 @@ function HTML_INSERT_URLS($text)
                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;
@@ -129,7 +121,7 @@ function HTML_INSERT_URLS($text)
                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;