]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/what-extensions.php
config.php partly solved, see #117
[mailer.git] / inc / modules / admin / what-extensions.php
index 3a81efd449ad9b25d4f85f339139abbe5bad3b05..53abc64888c001907ff674f046df8056df910226 100644 (file)
@@ -48,7 +48,7 @@ ADD_DESCR('admin', __FILE__);
 // Normally we want the overview of all registered extensions
 $do = "overview";
 $SEL = 0;
-if (REQUEST_ISSET_POST('sel')) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $SEL = countPostSelection();
 
 if (REQUEST_ISSET_GET(('reg_ext'))) {
        // We are about to register a new extension
@@ -62,9 +62,9 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
                        // Keep this extension active!
                } else {
                        // De/activate extension
-                       $ACT = "N"; $EXT_LOAD_MODE = 'deactivate';
-                       if ($active == 'N') { $ACT = "Y"; $EXT_LOAD_MODE = 'activate'; }
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",
+                       $ACT = 'N'; $EXT_LOAD_MODE = 'deactivate';
+                       if ($active == 'N') { $ACT = 'Y'; $EXT_LOAD_MODE = 'activate'; }
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='".$ACT."' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
                                array(bigintval($ext_id), $active), __FILE__, __LINE__);
 
                        // Run embeded SQL commands
@@ -91,11 +91,11 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
                                // Update extension's record
                                if (GET_EXT_VERSION('sql_patches') >= '0.0.6') {
                                        // Update also CSS column when extensions sql_patches is newer or exact v0.0.6
-                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', `ext_active`='%s' WHERE `id`=%s LIMIT 1",
                                                array(REQUEST_POST('css', $ext_id), $active, $ext_id), __FILE__, __LINE__);
                                } else {
                                        // When extension is older than v0.0.6 there is no column for the CSS information
-                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='%s' WHERE `id`=%s LIMIT 1",
                                                array($active, $ext_id), __FILE__, __LINE__);
                                }
 
@@ -114,18 +114,18 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_EXT_CHANGED'));
        } else {
                // Edit selected entries
-               $SW = "2"; $OUT = '';
+               $SW = 2; $OUT = '';
                foreach (REQUEST_POST('sel') as $ext_id => $sel) {
                        // Edit this extension?
                        if (($sel == 'Y') || ($sel == 'N')) {
                                // Load required data
                                if (GET_EXT_VERSION('sql_patches') >= '0.0.6') {
-                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `id`=%s LIMIT 1",
                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $css, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                } else {
-                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `id`=%s LIMIT 1",
                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -133,15 +133,15 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
                                }
 
                                // Output row
-                               $cssSelection = "---";
-                               if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = ADD_SELECTION("yn", $css, "css", $ext_id);
+                               $cssSelection = '---';
+                               if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = ADD_SELECTION('yn', $css, "css", $ext_id);
 
                                // Prepare data for the row template
                                $content = array(
                                        'sw'     => $SW,
                                        'id'     => $ext_id,
                                        'name'   => $name,
-                                       'active' => ADD_SELECTION("yn", $active, 'active', $ext_id),
+                                       'active' => ADD_SELECTION('yn', $active, 'active', $ext_id),
                                        'css'    => $cssSelection,
                                );
 
@@ -156,7 +156,7 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
 
                // Load template
                LOAD_TEMPLATE("admin_extensions_edit");
-               $do = "edit";
+               $do = 'edit';
        }
 } elseif ((REQUEST_ISSET_POST('delete')) && ($SEL > 0) && (!IS_DEMO())) {
        // List extensions and when verbose is enabled SQL statements which will be executed
@@ -225,7 +225,7 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
 // Shall we display active/inactive extensions?
 $where = '';
 if (REQUEST_ISSET_GET(('active'))) {
-       $where = sprintf("WHERE ext_active = '%s'", SQL_ESCAPE(strip_tags(REQUEST_GET('active'))));
+       $where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(strip_tags(REQUEST_GET('active'))));
 } // END - if
 
 // Case selection
@@ -251,15 +251,15 @@ ORDER BY ext_name", __FILE__, __LINE__);
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare CSS selection output
-                       $cssSelection = "---";
-                       if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = TRANSLATE_YESNO($content['ext_css']);
+                       $cssSelection = '---';
+                       if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = translateYesNo($content['ext_css']);
 
                        // Prepare data for the row template
                        $content = array(
                                'sw'      => $SW,
                                'id'      => $content['ext_id'],
                                'name'    => $content['ext_name'],
-                               'active'  => TRANSLATE_YESNO($content['ext_active']),
+                               'active'  => translateYesNo($content['ext_active']),
                                'act_val' => $content['ext_active'],
                                'css'     => $cssSelection,
                                'ver'     => $content['ext_version'],
@@ -285,8 +285,8 @@ ORDER BY ext_name", __FILE__, __LINE__);
        break;
 
 case 'register': // Register new extension
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s AND task_type='EXTENSION' LIMIT 1",
-               array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `assigned_admin`=%s AND `task_type`='EXTENSION' LIMIT 1",
+               array(getCurrentAdminId()), __FILE__, __LINE__);
        $task_found = SQL_NUMROWS($result);
 
        // Free result
@@ -295,7 +295,7 @@ case 'register': // Register new extension
        // Is the ID number valid and the task was found?
        if (($ext_id > 0) && ($task_found == 1)) {
                // ID is valid so begin with registration, we first want to it's real name from task management (subject column)
-               $result = SQL_QUERY_ESC("SELECT subject FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `id`=%s LIMIT 1",
                        array(bigintval($ext_id)), __FILE__, __LINE__);
                list($subj) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -304,7 +304,7 @@ case 'register': // Register new extension
                $cache_update = 0;
                if (!empty($subj)) {
                        // Extract extension's name from subject...
-                       $ext_name = trim(substr($subj, 1, strpos($subj, ":") - 1));
+                       $ext_name = trim(substr($subj, 1, strpos($subj, ':') - 1));
 
                        // Test the extension for deprecation
                        LOAD_EXTENSION($ext_name, 'test');
@@ -318,25 +318,26 @@ case 'register': // Register new extension
 
                                        // Show next link
                                        if (EXT_IS_ACTIVE('task')) {
-                                               LOAD_TEMPLATE("admin_next_link", false, array(
-                                                       'url'   => "modules.php?module=admin&what=list_task",
+                                               LOAD_TEMPLATE('admin_next_link', false, array(
+                                                       'url'   => 'modules.php?module=admin&what=list_task',
                                                        'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
                                                ));
                                        } else {
-                                               LOAD_TEMPLATE("admin_next_link", false, array(
-                                                       'url'   => "modules.php?module=admin",
+                                               LOAD_TEMPLATE('admin_next_link', false, array(
+                                                       'url'   => 'modules.php?module=admin',
                                                        'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
                                                ));
                                        }
 
                                        // Do we need to update cache file?
-                                       if ((EXT_IS_ACTIVE('cache')) && ($GLOBALS['cache_mode'] != "no")) {
+                                       // @TODO Rewrite this to a filter
+                                       if ((EXT_IS_ACTIVE('cache')) && ($GLOBALS['cache_mode'] != 'no')) {
                                                // Remove cache file (will be auto-created again!)
-                                               if ($GLOBALS['cache_instance']->loadCacheFile("config")) $GLOBALS['cache_instance']->destroyCacheFile();
-                                               if ($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) $GLOBALS['cache_instance']->destroyCacheFile();
-                                               if ($GLOBALS['cache_instance']->loadCacheFile("modreg")) $GLOBALS['cache_instance']->destroyCacheFile();
+                                               if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->destroyCacheFile();
+                                               if ($GLOBALS['cache_instance']->loadCacheFile('extensions', true)) $GLOBALS['cache_instance']->destroyCacheFile();
+                                               if ($GLOBALS['cache_instance']->loadCacheFile('modreg')) $GLOBALS['cache_instance']->destroyCacheFile();
                                        } // END - if
-                               } elseif (GET_EXT_VERSION($ext_name) != "") {
+                               } elseif (GET_EXT_VERSION($ext_name) != '') {
                                        // Notify the admin that we have a problem here...
                                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY'));
                                } else {
@@ -351,7 +352,7 @@ case 'register': // Register new extension
                        // Extension was not found in task management
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ID_404'));
                }
-       } elseif ($task_found == "0") {
+       } elseif ($task_found == '0') {
                // No longer assigned or old task
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
        } else {