More globals rewritten, see #100

[mailer.git] / inc / extensions / ext-html_mail.php

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 7db775f15fa115439a83685f8ae23ee7a39d6fff..a0685fe8c65dce3019f31291ee30e37376ce6f43 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -134,11 +134,8 @@ case "test": // For testing purposes. For details see file inc/modules/admin/wha
        break;
 
 default: // Do stuff when extension is loaded
-       // Define all arrary variables as global!
-       global $HTML_TAGS, $URL_ENDS, $VALID_EMAI_CHARS;
-
        // Valid HTML tags (only simple and no attributes!)
-       $HTML_TAGS = array(
+       $GLOBALS['html_tags'] = array(
                "b",
                "i",
                "u",
@@ -155,7 +152,7 @@ default: // Do stuff when extension is loaded
        // URL ends which are used to indentify the end of an URL or email link
        // Don't use these chars in links... ;-)
        //
-       $URL_ENDS = array(
+       $GLOBALS['url_ends'] = array(
                " ",
                "\n",
                "\r",
@@ -163,7 +160,7 @@ default: // Do stuff when extension is loaded
        );
 
        // Valid email chars (without @, or do you want to have another @ inside your email addy?)
-       $VALID_EMAIL_CHARS = array(
+       $GLOBALS['valid_email_chars'] = array(
                'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s',
                't','u','v','w','x','y','z','a','B','C','D','E','F','G','H','I','J','K','L',
                'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','-','.','_','0','1',