Fixes for sql_patches removal vs. password reset of admin

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 82337575ee6fa11e6853dcb71b8ff1245beefaa1..1ca104512ee2326f03f31527a14b6ebdad63f7d1 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -59,20 +59,18 @@ 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;
        }
 
        // Do not recreate cache file when it's switched off!
-       if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == 'N')) $cacheMode = "skip";
+       if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == "N")) $cacheMode = "skip";
 
        // Load language
        if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
@@ -80,8 +78,7 @@ if (EXT_IS_ACTIVE("cache"))
        $cacheMode = "no";
 }
 
-if ($cacheMode == "load")
-{
+if ($cacheMode == "load") {
        // Load more cache files (like admins)
        require_once(PATH."inc/load_cache.php");
 
@@ -90,24 +87,21 @@ 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");
+               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')
-               {
-                       $INC = sprintf(PATH."inc/language/%s_%s.php", $name, GET_LANGUAGE());
+               if ($EXT_DUMMY['ext_lang'][$k] == "Y") {
+                       $INC = sprintf("%sinc/language/%s_%s.php", PATH, $name, GET_LANGUAGE());
                        if (file_exists($INC)) require_once($INC);
                }
 
                // Load CSS file
-               if ($EXT_DUMMY['ext_css'][$k] == 'Y') $EXT_CSS_FILES[] = "".$name.".css";
+               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");
                }
 
@@ -143,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()) && ($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."
@@ -188,14 +177,14 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                //* DEBUG: */ echo "*".$name."/".$menu."*<br>";
 
                // An empty menu entry will be interpreted as N (no menu) to avoid problems
-               if (empty($menu)) $menu = 'N';
+               if (empty($menu)) $menu = "N";
 
                // Load extensions
-               $file1 = sprintf(PATH."inc/extensions/ext-%s.php", $name);
-               $file2 = $file1; $EXT_CSS = 'N'; $EXT_ALWAYS_ACTIVE = 'N';
+               $file1 = sprintf("%sinc/extensions/ext-%s.php", PATH, $name);
+               $file2 = $file1; $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
 
                // Special functions file
-               $file3 = sprintf(PATH."inc/libs/%s_functions.php", $name);
+               $file3 = sprintf("%sinc/libs/%s_functions.php", PATH, $name);
 
                // Does the extension file exists?
                if (file_exists($file1) && is_readable($file1))
@@ -203,32 +192,32 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                        // If there's no language file specified we don't need to load one... ;-)
                        if (!empty($lang)) {
                                // Create language file
-                               $file2 = sprintf(PATH."inc/language/%s_%s.php", $lang, GET_LANGUAGE());
+                               $file2 = sprintf("%sinc/language/%s_%s.php", PATH, $lang, GET_LANGUAGE());
                        }
 
                        if (file_exists($file3) && is_readable($file3))
                        {
                                // Special functions file
-                               $funcs = 'Y';
+                               $funcs = "Y";
                                require_once($file3);
                        }
                         else
                        {
                                // Don't load functions file
-                               $funcs = 'N';
+                               $funcs = "N";
                        }
 
                        // Do we need a language file?
                        if (($file1 != $file2) && (file_exists($file2)) && (is_readable($file2)))
                        {
                                // Load language file
-                               $lang = 'Y';
+                               $lang = "Y";
                                include($file2);
                        }
                         else
                        {
                                // Don't load language file
-                               $lang = 'N';
+                               $lang = "N";
                        }
 
                        // Load extension
@@ -240,12 +229,12 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                         else
                        {
                                // KEEP sql_patches ALWAYS ACTIVE!
-                               $EXT_ALWAYS_ACTIVE = 'Y';
+                               $EXT_ALWAYS_ACTIVE = "Y";
                        }
 
-                       if ($css == 'Y')
+                       if ($css == "Y")
                        {
-                               $CSS_FILE = PATH."theme/".GET_CURR_THEME()."/css/".$name.".css";
+                               $CSS_FILE = sprintf("%stheme/%s/css/%s.css", PATH, GET_CURR_THEME(), $name);
                                if (file_exists($CSS_FILE))
                                {
                                        // CSS file for extension was found (use only relative path for now!)
@@ -254,7 +243,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode ==
                                 else
                                {
                                        // Don't load CSS file
-                                       $css = 'N';
+                                       $css = "N";
                                }
                        }