Security line in all includes changed

[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 821b0592ebb8237695fe29a7eeb7d30b86782727..3669fb8fc49537ede846881ec883bdb139f0c8f4 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -51,17 +50,17 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installtion 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[] = "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[] = "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 action='main' AND what='html_mail' LIMIT 1";
        break;