New functions introduced, several rewrites:

[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 629cd10d5cf267703cbf53d6638f22919d8d86ca..e85fcc78a15fedd392cd2c135907dacbc6799fb3 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -57,7 +57,7 @@ if (isGetRequestElementSet('reg_ext')) {
                // Shall we keep the extension always active?
                if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($active == 'Y')) {
                        // Keep this extension active!
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE'), getExtensionName($ext_id)));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id)));
                } else {
                        // De/activate extension
                        $ACT = 'N'; setExtensionMode('deactivate');
@@ -69,9 +69,9 @@ if (isGetRequestElementSet('reg_ext')) {
                        doExtensionSqls($ext_id, getExtensionMode());
                }
        }
-} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet(('modify')))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Change settings like CSS file load
-       if (isPostRequestElementSet(('modify'))) {
+       if (isPostRequestElementSet('modify')) {
                // Change entries
                $cache_update = '0';
                foreach (postRequestElement('sel') as $ext_id => $sel) {
@@ -222,7 +222,7 @@ if (isGetRequestElementSet('reg_ext')) {
        } // END - foreach
 
        // Extensions removed
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSIONS_REMOVED'), countPostSelection()));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', countPostSelection()));
 } elseif ((isGetRequestElementSet('do')) && (!isDemoModeActive())) {
        // Other things to do
        $do = SQL_ESCAPE(secureString(getRequestElement('do')));
@@ -324,7 +324,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                                // Errors?
                                                if (getTotalFatalErrors() == '0') {
                                                        // Extension was found and successfully registered
-                                                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_REGISTERED'), $ext_name));
+                                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', $ext_name));
 
                                                        // Show next link
                                                        if (isExtensionActive('task')) {
@@ -340,7 +340,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                                        }
                                                } else {
                                                        // Errors detected!
-                                                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_NOT_REGISTERED'), $ext_name));
+                                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name));
                                                }
 
                                                // Do we need to update cache file?
@@ -356,7 +356,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY'));
                                        } else {
                                                // Notify the admin that we have a problem here...
-                                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_REG_FAILED_404'), $ext_name));
+                                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_REG_FAILED_404', $ext_name));
                                        }
                                } else {
                                        // Motify the admin that we have a problem here...