Security line in all includes changed

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 1250799913ba3902275615a04a0d515430a4b3b7..969d8617098e9d2986b63d28b083e9a2e63f6721 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // 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);
 }
+
 //
 function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
 {
@@ -191,7 +191,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                                        foreach ($INC_POOL as $inc) {
                                                require_once($inc);
                                        } // END - foreach
-                               }
+                               } // END - if
 
                                // Register extension
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s', '%s', '%s', '%s')",
@@ -200,8 +200,14 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                                // Update task management
                                ADMIN_SOLVE_TASK($id);
 
+                               // @TODO This causes the whole (!) menu cache being purged
+                               CACHE_PURGE_ADMIN_MENU();
+
                                // In normal mode return a true on success
-                               $ret = true; unset($SQLs);
+                               $ret = true;
+
+                               // Remove SQLs
+                               unset($SQLs);
                        } else {
                                // Rewrite SQL command to keep { and } inside
                                foreach ($SQLs as $key => $sql) {
@@ -299,6 +305,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
                        if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
                        if ($cacheInstance->cache_file("mod_reg", true))    $cacheInstance->cache_destroy();
                        if ($cacheInstance->cache_file("config", true))     $cacheInstance->cache_destroy();
+
+                       // @TODO This causes the whole (!) menu cache being purged
+                       CACHE_PURGE_ADMIN_MENU();
                } // END - if
 
                // Is this the sql_patches?
@@ -328,13 +337,13 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
        // Check cache
        if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) {
                // Load from cache
-               //* DEBUG: */ echo "CACHE!<br />\n";
+               //* DEBUG: */ echo "CACHE! ext_name={$ext_name}<br />\n";
                $active = $cacheArray['extensions']['ext_active'][$ext_name];
 
                // Count cache hits
                if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++;
        } elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
-               //* DEBUG: */ echo "DB!<br />\n";
+               //* DEBUG: */ echo "DB! ext_name={$ext_name}<br />\n";
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_active FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
                 array($ext_name), __FILE__, __LINE__);