More constant 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 7bab8cf7d26a7867a20f1df33db9feab39675d19..9b2e17a70b0888df31fda50c3350bf42767a7a43 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -43,7 +43,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 = SELECTION_COUNT(REQUEST_POST('sel'));
 
 if (REQUEST_ISSET_GET(('reg_ext'))) {
        // We are about to register a new extension
@@ -66,7 +66,7 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
                        EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
                }
        }
-} elseif (((REQUEST_ISSET_POST(('edit'))) || (REQUEST_ISSET_POST(('modify')))) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif (((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST(('modify')))) && ($SEL > 0) && (!IS_DEMO())) {
        // Change settings like CSS file load
        if (REQUEST_ISSET_POST(('modify'))) {
                // Change entries
@@ -151,7 +151,7 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
        $SW = 2; $OUT = "";
        foreach (REQUEST_POST('sel') as $ext_id => $sel) {
                // Init variables
-               $VERBOSE_OUT = ""; $SQLs = array();
+               $VERBOSE_OUT = ""; INIT_SQLS();
 
                // Secure id number
                $ext_id = bigintval($ext_id);
@@ -161,9 +161,9 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
 
                if (getConfig('verbose_sql') == "Y") {
                        // Load SQL commands in remove mode
-                       if (LOAD_EXTENSION($ext_name, "remove", "", true, $SQLs)) {
+                       if (LOAD_EXTENSION($ext_name, "remove", "", true)) {
                                // Generate extra table with loaded SQL commands
-                               $VERBOSE_OUT = EXTENSION_VERBOSE_TABLE($SQLs);
+                               $VERBOSE_OUT = EXTENSION_VERBOSE_TABLE();
                        } // END - if
                } // END - if
 
@@ -195,7 +195,7 @@ if (REQUEST_ISSET_GET(('reg_ext'))) {
                // Is this extension selected?
                if ($active == 1) {
                        // Run any assigned removal filters
-                       RUN_FILTER('extension_remove', GET_EXT_NAME($ext_id));
+                       runFilterChain('extension_remove', GET_EXT_NAME($ext_id));
 
                        // Run embeded SQL commands
                        EXTENSION_RUN_SQLS($ext_id, "remove");
@@ -294,14 +294,12 @@ case "register": // Register new extension
                        $ext_name = trim(substr($subj, 1, strpos($subj, ":") - 1));
 
                        // Test the extension for deprecation
-                       global $EXT_DEPRECATED;
                        LOAD_EXTENSION($ext_name, "test");
 
                        // Is the extension deprecated?
-                       if ($EXT_DEPRECATED == "N") {
+                       if (EXT_GET_DEPRECATED() == "N") {
                                // ... so we can finally register and load it in registration mode
-                               $status = EXTENSION_REGISTER($ext_name, $ext_id);
-                               if ($status == true) {
+                               if (EXTENSION_REGISTER($ext_name, $ext_id)) {
                                        // Extension was found and successfully registered
                                        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXTENSION_REGISTERED'));
 
@@ -323,14 +321,14 @@ case "register": // Register new extension
                                                // 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("mod_reg")) $GLOBALS['cache_instance']->destroyCacheFile();
+                                               if ($GLOBALS['cache_instance']->loadCacheFile("modreg")) $GLOBALS['cache_instance']->destroyCacheFile();
                                        } // END - if
                                } 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 {
                                        // Notify the admin that we have a problem here...
-                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_404'));
+                                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_REG_FAILED_404'), $ext_name));
                                }
                        } else {
                                // Motify the admin that we have a problem here...