Entire rewrite of mail part in app! Not kidding here...

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

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 5328c1d739d68141a2fb0f28f69df639f6292f14..fc04a655f121b1d32378b5546b37bc25820289b0 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.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);
 }
@@ -112,7 +111,7 @@ case "update": // Update an extension
 
        case "0.0.9": // SQL queries for v0.0.9
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES ('setup', 'config_rewrite', 'Rewrite-Engine', 'Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden.";
@@ -136,11 +135,9 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $dummy = LOAD_CONFIG();
-       $_CONFIG = merge_array($_CONFIG, $dummy);
-       unset($dummy);
        break;
 }
+
 // Language file prefix
 $EXT_LANG_PREFIX = "rewrite";