Surfbar now has admin menu (dummy extension!), menu system rebuilded for unique key...

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index b7499dae519648d1ada089037c92741ba0755c33..75b0c422be5d182e635be63fed865f1b59125be8 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -46,15 +46,12 @@ $ADD = "";
 if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return;
 
 // Load default sql_patches extension if present
-if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."inc/extensions/ext-sql_patches.php"))
-{
+if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."inc/extensions/ext-sql_patches.php")) {
        // Load it...
        $EXT_LOAD_MODE = "";
        require_once(PATH."inc/extensions/ext-sql_patches.php");
        $cacheArray['active_extensions'] = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
-}
- else
-{
+} else {
        // Initialize array for "always keep active extensions"
        $cacheArray['active_extensions'] = array();
 }
@@ -62,14 +59,12 @@ if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."
 //
 // Load extensions
 //
-if (EXT_IS_ACTIVE("cache"))
-{
+if (EXT_IS_ACTIVE("cache")) {
        // Load cache extension alone
        include_once(PATH."inc/libs/cache_functions.php");
        $cacheMode = "";
        include_once(PATH."inc/extensions/ext-cache.php");
-       switch($cacheInstance->cache_file("extensions", true))
-       {
+       switch($cacheInstance->cache_file("extensions", true)) {
                case true : $cacheMode = "load"; break;
                case false: $cacheMode = "init"; break;
        }
@@ -79,14 +74,11 @@ if (EXT_IS_ACTIVE("cache"))
 
        // Load language
        if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
-}
- else
-{
+} else {
        $cacheMode = "no";
 }
 
-if ($cacheMode == "load")
-{
+if ($cacheMode == "load") {
        // Load more cache files (like admins)
        require_once(PATH."inc/load_cache.php");
 
@@ -95,14 +87,12 @@ if ($cacheMode == "load")
 
        // Load extension data from cache file
        $EXT_DUMMY = $cacheInstance->cache_load();
-       foreach ($EXT_DUMMY['ext_name'] as $k=>$name)
-       {
+       foreach ($EXT_DUMMY['ext_name'] as $k=>$name) {
                // Load functions file
                if ($EXT_DUMMY['ext_funcs'][$k] == 'Y') require_once(PATH."inc/libs/".$name."_functions.php");
 
                // Load Language file
-               if ($EXT_DUMMY['ext_lang'][$k] == 'Y')
-               {
+               if ($EXT_DUMMY['ext_lang'][$k] == 'Y') {
                        $INC = sprintf(PATH."inc/language/%s_%s.php", $name, GET_LANGUAGE());
                        if (file_exists($INC)) require_once($INC);
                }
@@ -111,8 +101,7 @@ if ($cacheMode == "load")
                if ($EXT_DUMMY['ext_css'][$k] == 'Y') $EXT_CSS_FILES[] = "".$name.".css";
 
                // Load extension file itself
-               if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y') || (IS_ADMIN()))
-               {
+               if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y') || (IS_ADMIN())) {
                        require_once(PATH."inc/extensions/ext-".$name.".php");
                }
 
@@ -148,22 +137,17 @@ if ($cacheMode == "load")
 
        // No database load needed
        $res_ext_crt = false;
-}
- else
-{
+} else {
        // If current user is not admin load only activated extensions
        // The admin shall use every available extension for testing purposes
-       if (!IS_ADMIN()) $ADD = " WHERE ext_active='Y'";
+       if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
 
-       if (GET_EXT_VERSION("sql_patches") >= "0.0.6")
-       {
+       if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Query with CSS file from DB
                $res_ext_crt = SQL_QUERY("SELECT id, ext_name, ext_lang_file, ext_has_css, ext_active, ext_version
 FROM "._MYSQL_PREFIX."_extensions".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
-       }
-        else
-       {
+       } else {
                // Old obsulete query string
                $res_ext_crt = SQL_QUERY("SELECT id, ext_name, ext_lang_file, ext_name, ext_active, ext_version
 FROM "._MYSQL_PREFIX."_extensions".$ADD."