Security line in all includes changed

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 970e0a71ad57cabdcc4a61aa4d0ba088b98ba384..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)
 {
@@ -55,7 +55,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
 
        // Does this extension exists?
-       if (file_exists($file) && is_readable($file))
+       if (FILE_READABLE($file))
        {
                // Extension was found so we can load it in registration mode
                require($file);
@@ -98,7 +98,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
                        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $EXT_UPDATE_DEPENDS);
 
                        // Check for required file
-                       if (file_exists($file) && is_readable($file))
+                       if (FILE_READABLE($file))
                        {
                                // File exists so let's load it
                                $VER_BACKUP = $EXT_VERSION;
@@ -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) {
@@ -241,6 +247,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
        global $cacheInstance;
        $SQLs = array();
 
+       // By default no SQL has been executed
+       $sqlRan = false;
+
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
 
@@ -249,9 +258,14 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
        if (empty($ext_name)) return false;
 
        // Load extension in detected mode
+       //* DEBUG: */ echo __FUNCTION__.":ext_name[{$id}]={$ext_name}<br />\n";
        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-       if (file_exists($file) && is_readable($file)) require($file);
+       if (FILE_READABLE($file)) {
+               // Load the include
+               require($file);
+       }
 
+       //* DEBUG: */ echo __FUNCTION__.":SQLs::count=".count($SQLs)."<br />\n";
        if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
                // Run SQL commands...
                foreach ($SQLs as $sql) {
@@ -261,6 +275,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
                        // Is there still an SQL query?
                        if (!empty($sql)) {
                                // Do we have an "ALTER TABLE" command?
+                               //* DEBUG: */ echo __FUNCTION__.":SQL={$SQL}<br />\n";
                                if (substr(strtolower($sql), 0, 11) == "alter table") {
                                        // Analyse the alteration command
                                        SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
@@ -268,6 +283,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
                                        // Run regular SQL command
                                        $result = SQL_QUERY($sql, __FILE__, __LINE__, false);
                                }
+
+                               // An SQL has been executed
+                               $sqlRan = true;
                        } // END - if
                } // END - foreach
 
@@ -278,13 +296,18 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
                         array($id), __FILE__, __LINE__);
                } // END - if
 
+               //* DEBUG: */ echo __FUNCTION__.":mode={$EXT_LOAD_MODE}<br />\n";
+
                // Remove cache file(s) if extension is active
-               if ((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) {
+               if (((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) && (((SQL_AFFECTEDROWS() == 1) && ($EXT_LOAD_MODE == "remove")) || ($sqlRan === true))) {
                        //* DEBUG: */ echo __LINE__.": DESTROY!<br />\n";
                        // Remove cache files
                        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?
@@ -305,7 +328,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
 
        // Extension's file name will also be checked
        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-       if ((!file_exists($file)) && (!is_readable($file))) return false;
+       if (!FILE_READABLE($file)) return false;
        //* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")<br />";
 
        // Not active is the default
@@ -314,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__);
@@ -351,9 +374,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
                (
                        $active == "Y"
                ) && (
-                       file_exists($inc)
-               ) && (
-                       is_readable($inc)
+                       FILE_READABLE($inc)
                )
        );
 }
@@ -364,10 +385,12 @@ function GET_EXT_VERSION ($ext_name) {
 
        // Extensions are all inactive during installation
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
+       //* DEBUG: */ echo __FUNCTION__.": ext_name={$ext_name}<br />\n";
 
        // Is the cache written?
        if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
                // Load data from cache
+               //* DEBUG: */ echo __FUNCTION__.": CACHE!<br />\n";
                $ret = $cacheArray['extensions']['ext_version'][$ext_name];
 
                // Count cache hits
@@ -382,6 +405,9 @@ function GET_EXT_VERSION ($ext_name) {
                // Set cache
                $cacheArray['extensions']['ext_version'][$ext_name] = $ret;
        }
+
+       // Return result
+       //* DEBUG: */ echo __FUNCTION__.": ret={$ret}<br />\n";
        return $ret;
 }
 //