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 01a98f8bc2f0a3fdfa6e487b4287ad2d83a46a87..a0685fe8c65dce3019f31291ee30e37376ce6f43 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -38,40 +38,40 @@ if (!defined('__SECURITY')) {
 }
 
 // Version number
-$EXT_VERSION = "0.1.5";
+$EXT_VERSION = "0.1.6";
 
 // Auto-set extension version
 if (empty($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
-$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.51", "0.0.52", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5");
+$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.51", "0.0.52", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6");
 
 switch ($EXT_LOAD_MODE)
 {
-case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
+case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (action, what, title, sort, visible, locked) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')";
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP html";
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus DROP html_msg";
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool DROP html_msg";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='html_mail' LIMIT 1";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP html";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` DROP html_msg";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` DROP html_msg";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='html_mail' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='html_mail' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='html_mail' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='html_mail' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='html_mail' LIMIT 1";
        break;
 
 case "update": // Update an extension
@@ -99,12 +99,12 @@ case "update": // Update an extension
 
        case "0.1.1": // SQL queries for v0.1.1
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+               $UPDATE_NOTES = "Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
                break;
 
        case "0.1.2": // SQL queries for v0.1.2
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+               $UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
                break;
 
        case "0.1.3": // SQL queries for v0.1.3
@@ -121,16 +121,21 @@ case "update": // Update an extension
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlerhinweis bei deaktivierter Erweiterung verbessert.";
                break;
+
+       case "0.1.6":
+               // Dependency is needed for ext-registration!! (want to alter a non existent Table)
+               $EXT_UPDATE_DEPENDS = "bonus";
+               $UPDATE_NOTES = "Abh&auml;nigkeit von der Erweiterung <strong>bonus</strong> hinzugef&uuml;gt.";
+               break;
        }
        break;
 
-default: // Do stuff when extension is loaded
-
-       // Define all arrary variables as global!
-       global $HTML_TAGS, $URL_ENDS, $VALID_EMAI_CHARS;
+case "test": // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+       break;
 
+default: // Do stuff when extension is loaded
        // Valid HTML tags (only simple and no attributes!)
-       $HTML_TAGS = array(
+       $GLOBALS['html_tags'] = array(
                "b",
                "i",
                "u",
@@ -147,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",
@@ -155,19 +160,14 @@ 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',
+               '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',
                '2','3','4','5','6','7','8','9'
        );
        break;
 }
-// Language file prefix
-$EXT_LANG_PREFIX = "html_mail";
-
-// Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
 
 //
 ?>