Functions renamed to new naming convetion, TODOs.txt updated

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 18ff9c64dffbf3e9fddebf5d52e122eed84fcda4..96b15450cd3c61e3b4b3a2d1afdc2c621c5c7d23 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -55,7 +55,7 @@ $GLOBALS['cache_array'] = array();
 // Skip loading extensions
 if ((!isInstalled()) || (isInstalling())) {
        // Init filter system here
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 
        // Skip loading
        return;
@@ -185,10 +185,10 @@ if ($GLOBALS['cache_mode'] == 'load') {
        } // END - foreach
 
        // Init filter system
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 
        // Load more cache files (like admins)
-       LOAD_INC_ONCE('inc/load_cache.php');
+       loadIncludeOnce('inc/load_cache.php');
 
        // Remove array
        unset($EXT_POOL);
@@ -196,18 +196,18 @@ if ($GLOBALS['cache_mode'] == 'load') {
        // If current user is not admin load only activated extensions. But load
        // them all if we are going to init the cache files. The admin shall use
        // every available extension for testing purposes.
-       if ((!IS_ADMIN()) && ($GLOBALS['cache_mode'] != 'init')) $add = " WHERE ext_active='Y'";
+       if ((!IS_ADMIN()) && ($GLOBALS['cache_mode'] != 'init')) $add = " WHERE `ext_active`='Y'";
 
        if (GET_EXT_VERSION('sql_patches') >= '0.0.6') {
                // Query with CSS file from DB
-               $res_ext_crt = SQL_QUERY('SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version
-FROM `{!_MYSQL_PREFIX!}_extensions`' . $add . '
-ORDER BY ext_name', __FILE__, __LINE__);
+               $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version
+FROM `{!_MYSQL_PREFIX!}_extensions`" . $add . "
+ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Old obsolete query string
-               $res_ext_crt = SQL_QUERY('SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version
-FROM `{!_MYSQL_PREFIX!}_extensions`' . $add . '
-ORDER BY ext_name', __FILE__, __LINE__);
+               $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version
+FROM `{!_MYSQL_PREFIX!}_extensions`" . $add . "
+ORDER BY ext_name", __FILE__, __LINE__);
        }
 }
 
@@ -228,7 +228,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == 'init') && (
                $FQFN = sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $content['ext_name']);
 
                // Does the extension file exists?
-               if (FILE_READABLE($FQFN)) {
+               if (isFileReadable($FQFN)) {
                        // By default no extension is always active, except sql_patches
                        EXT_SET_ALWAYS_ACTIVE('N');
 
@@ -247,10 +247,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == 'init') && (
                        // CSS file handling:
                        if ((!isset($content['ext_css'])) || ($content['ext_css'] == 'Y')) {
                                // Create FQFN for the CSS file
-                               $FQFN = sprintf("%stheme/%s/css/%s.css", constant('PATH'), GET_CURR_THEME(), $content['ext_name']);
+                               $FQFN = sprintf("%stheme/%s/css/%s.css", constant('PATH'), getCurrentTheme(), $content['ext_name']);
 
                                // Is the file there?
-                               if (FILE_READABLE($FQFN)) {
+                               if (isFileReadable($FQFN)) {
                                        // CSS file for extension was found (use only relative path for now!)
                                        EXT_ADD_CSS_FILE($content['ext_name'] . '.css');
                                        $content['ext_css'] = 'Y';
@@ -268,28 +268,28 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == 'init') && (
                                // Remember this value for later usage
                                $GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = EXT_GET_ALWAYS_ACTIVE();
                        }
-               } elseif (!FILE_READABLE($FQFN)) {
+               } elseif (!isFileReadable($FQFN)) {
                        // Deleted extension file so we mark it for removal from DB
                        $DEL[] = $content['ext_name'];
                }
        } // END - while
 
        // Init filter system
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 
        if ($GLOBALS['cache_mode'] == 'init') {
                // Close cache file
                $GLOBALS['cache_instance']->finalize();
 
                // Load more cache files (like admins)
-               LOAD_INC_ONCE('inc/load_cache.php');
+               loadIncludeOnce('inc/load_cache.php');
        } // END - if
 
        // Free memory
        SQL_FREERESULT($res_ext_crt);
 } elseif (!EXT_IS_ACTIVE('cache')) {
        // Init filter system even when there are no extensions installed. #16
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 }
 
 // Run the filter
@@ -300,12 +300,12 @@ if (!empty($DEL[0])) {
        // Remove extensions from two tables: extension registry and tasks table
        foreach ($DEL as $del_ext) {
                // First remove entry from extensions table
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-                       array($del_ext), __FILE__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+               array($del_ext), __FILE__, __LINE__);
 
                // Remove (maybe?) found tasks (main task and possible updates
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
-                       array($del_ext), __FILE__, __LINE__);
+               array($del_ext), __FILE__, __LINE__);
        } // END - foreach
 
        // I think it's not neccessary to run the optimization function here