Fixes for 'empty version'

[mailer.git] / inc / modules / admin / what-extensions.php

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index c9421a7cf65a586e51c38c21e217692037eea521..ab36ce7cfb210141054c7bdac95a285436c30573 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -1,6 +1,6 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 03/22/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 03/22/2004 *
  * ================                             Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
@@ -46,19 +46,12 @@ addMenuDescription('admin', __FILE__);
 
 // Normally we want the overview of all registered extensions
 $do = 'overview';
-$SEL = 0;
-
-// Are some extensions submitted?
-if (isPostRequestElementSet('sel')) {
-       // Then count all
-       $SEL = countPostSelection();
-} // END - if
 
 if (isGetRequestElementSet('reg_ext')) {
        // We are about to register a new extension
        $do = 'register'; $ext_id = bigintval(getRequestElement('reg_ext'));
-       // The ID comes from task management and it is - of course - *not* the extension's name!
-} elseif ((isPostRequestElementSet('change')) && ($SEL > 0) && (!isDemoModeActive())) {
+       // The id comes from task management and it is - of course - *not* the extension's name!
+} elseif ((isPostRequestElementSet('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // De-/activate extensions
        foreach (postRequestElement('sel') as $ext_id => $active) {
                // Shall we keep the extension always active?
@@ -75,13 +68,13 @@ if (isGetRequestElementSet('reg_ext')) {
                        doExtensionSqls($ext_id, getExtensionMode());
                }
        }
-} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet(('modify')))) && ($SEL > 0) && (!isDemoModeActive())) {
+} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet(('modify')))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Change settings like CSS file load
        if (isPostRequestElementSet(('modify'))) {
                // Change entries
-               $cache_update = 0;
+               $cache_update = '0';
                foreach (postRequestElement('sel') as $ext_id => $sel) {
-                       // Secure ID
+                       // Secure id
                        $ext_id = bigintval($ext_id);
 
                        // Change this extension?
@@ -162,7 +155,7 @@ if (isGetRequestElementSet('reg_ext')) {
                loadTemplate('admin_extensions_edit', false, $OUT);
                $do = 'edit';
        }
-} elseif ((isPostRequestElementSet('delete')) && ($SEL > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('delete')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // List extensions and when verbose is enabled SQL statements which will be executed
        $OUT = ''; $SW = 2;
        foreach (postRequestElement('sel') as $ext_id => $sel) {
@@ -213,11 +206,11 @@ if (isGetRequestElementSet('reg_ext')) {
        // Load template
        loadTemplate('admin_extensions_delete', false, $OUT);
        $do = 'delete';
-} elseif ((isPostRequestElementSet('remove')) && ($SEL > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Remove extensions from DB (you have to delete all files manually!)
-       $cache_update = 0;
+       $cache_update = '0';
        foreach (postRequestElement('sel') as $ext_id => $active) {
-               // Secure ID number
+               // Secure id number
                $ext_id = bigintval($ext_id);
 
                // Is this extension selected and id valid?
@@ -228,7 +221,7 @@ if (isGetRequestElementSet('reg_ext')) {
        } // END - foreach
 
        // Extensions removed
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSIONS_REMOVED'), $SEL));
+       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSIONS_REMOVED'), countPostSelection()));
 } elseif ((isGetRequestElementSet('do')) && (!isDemoModeActive())) {
        // Other things to do
        $do = SQL_ESCAPE(secureString(getRequestElement('do')));
@@ -267,7 +260,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Prepare CSS selection output
                                $cssSelection = '---';
-                               if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = translateYesNo($content['ext_css']);
+                               if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']);
 
                                // Prepare data for the row template
                                $content = array(
@@ -304,16 +297,16 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                // Free result
                SQL_FREERESULT($result);
 
-               // Is the ID number valid and the task was found?
+               // 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)
+                       // 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",
                                array(bigintval($ext_id)), __FILE__, __LINE__);
                        list($subj) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
 
                        // Disable cache update by default
-                       $cache_update = 0;
+                       $cache_update = '0';
                        if (!empty($subj)) {
                                // Extract extension's name from subject...
                                $ext_name = trim(substr($subj, 1, strpos($subj, ':') - 1));
@@ -326,7 +319,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                        // ... so we can finally register and load it in registration mode
                                        if (registerExtension($ext_name, $ext_id)) {
                                                // Errors?
-                                               if (getTotalFatalErrors() == 0) {
+                                               if (getTotalFatalErrors() == '0') {
                                                        // Extension was found and successfully registered
                                                        loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_REGISTERED'), $ext_name));
 
@@ -370,11 +363,11 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                // Extension was not found in task management
                                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ID_404'));
                        }
-               } elseif ($task_found == 0) {
+               } elseif ($task_found == '0') {
                        // No longer assigned or old task
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
                } else {
-                       // ID is invalid
+                       // id is invalid
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_INVALID'));
                }
                break;