Fixes for extension removal, now directly sent to [UN]REGISTER_FILTER()

diff --git a/inc/databases.php b/inc/databases.php
index 3968665986c56116288f1a5719e22b991e114062..fd18e36899ce46880e62f3e64796511ca81f4798 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "652");
+define('CURR_SVN_REVISION', "653");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/extensions.php b/inc/extensions.php
index 5686e7c0edd0e11a50de5e688da0f7e98d6543d8..4cc56fb5b6e10863564df84147d4d68ade3ecaf0 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -125,9 +125,9 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 
 // Registeres an extension and possible update depencies
 function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
-       global $UPDATE_NOTES, $_CONFIG, $INC_POOL, $cacheInstance;
+       global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
        global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
-       global $EXT_UPDATE_DEPENDS;
+       global $EXT_UPDATE_DEPENDS, $SQLs;
 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
@@ -282,7 +282,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
 // Run SQL queries for given extension id
 // @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
-       global $cacheInstance, $_CONFIG;
+       global $cacheInstance, $SQLs;
 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
@@ -420,7 +420,7 @@ function GET_EXT_VERSION ($ext_name) {
 // Updates a given extension with current extension version to latest version
 function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        // This shall never do a non-admin user!
-       global $cacheInstance, $_CONFIG, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
+       global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
        global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray;
 
        // Init arrays
@@ -519,7 +519,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
 
 // Output verbose SQL table for extension
 function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed = "", $switch = false, $width = "100%") {
-       global $_CONFIG, $SQLs;
+       global $SQLs;
 
        // Are there some queries in $queries?
        if (count($queries) > 0) {

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index d5d1972d331459054b5ffbe42e5e1db18c6b9901..b5e79e67a6fd3e3caa17a178557b27151fb79606 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -63,7 +63,7 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_admins DROP default_acl";
 
        // Remove filters
-       UNREGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, !$dry_run);
+       UNREGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, $dry_run);
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -291,7 +291,7 @@ PRIMARY KEY (id)
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // Add filters
-               REGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, !$dry_run);
+               REGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, $dry_run);
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.";

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index de4d83ef1567bdcf42799df01e0ab591f2a3732f..3798fa967750c08fae77eeef4085285b3a0a14b3 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -62,16 +62,16 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='config_cache' OR what='cache_stats' LIMIT 2";
 
        // Unregister all filters
-       UNREGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('post_extension_installed', 'CACHE_PURGE_ADMIN_MENU', true, !$dry_run);
-       UNREGISTER_FILTER('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('post_extension_run_sql', 'CACHE_PURGE_ADMIN_MENU', true, !$dry_run);
-       UNREGISTER_FILTER('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, !$dry_run);
-       UNREGISTER_FILTER('extension_remove', 'CACHE_DESTROY_ALL', true, !$dry_run);
+       UNREGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('post_extension_installed', 'CACHE_PURGE_ADMIN_MENU', true, $dry_run);
+       UNREGISTER_FILTER('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('post_extension_run_sql', 'CACHE_PURGE_ADMIN_MENU', true, $dry_run);
+       UNREGISTER_FILTER('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, $dry_run);
+       UNREGISTER_FILTER('extension_remove', 'CACHE_DESTROY_ALL', true, $dry_run);
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -214,14 +214,14 @@ case "update": // Update an extension
 
        case "0.2.1": // SQL queries for v0.2.1
                // Register the new filter
-               REGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, !$dry_run);
-               REGISTER_FILTER('extension_remove', 'CACHE_DESTROY_ALL', false, true, !$dry_run);
+               REGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, $dry_run);
+               REGISTER_FILTER('extension_remove', 'CACHE_DESTROY_ALL', false, true, $dry_run);
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Filter für Erweiterungsmanagement hinzugefügt.";
@@ -229,8 +229,8 @@ case "update": // Update an extension
 
        case "0.2.2": // SQL queries for v0.2.2
                // Register the new filter
-               REGISTER_FILTER('post_extension_installed', 'CACHE_PURGE_ADMIN_MENU', false, true, !$dry_run);
-               REGISTER_FILTER('post_extension_run_sql', 'CACHE_PURGE_ADMIN_MENU', false, true, !$dry_run);
+               REGISTER_FILTER('post_extension_installed', 'CACHE_PURGE_ADMIN_MENU', false, true, $dry_run);
+               REGISTER_FILTER('post_extension_run_sql', 'CACHE_PURGE_ADMIN_MENU', false, true, $dry_run);
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Weitere Filter hinzugefügt.";

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index e91e384008f6984c71054540824f75759d19693e..fec355f877b53d013c06ddddbb758805f16171d7 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -68,10 +68,10 @@ PRIMARY KEY(id)
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')";
 
        // Add admin menus
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')";
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('holiday','list_holiday','Auflisten','1','Alle Urlaubsschaltungen auflisten.')";
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('holiday','del_holiday','Urlaub beenden','2','Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur "Verstoss gegen unsere AGBs" ein!')";
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('holiday','config_holiday','Einstellungen','3','Maximale Tage für Urlaub usw. einstellen.')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','list_holiday','Auflisten','1','Alle Urlaubsschaltungen auflisten.')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','del_holiday','Urlaub beenden','2','Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur "Verstoss gegen unsere AGBs" ein!')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','config_holiday','Einstellungen','3','Maximale Tage für Urlaub usw. einstellen.')";
 
        // Remove 0 max mails per day
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_max_receive WHERE value='0' LIMIT 1";

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index fc8076054021d8786e641777287e922629fc73ad..1ed6e70204b891c55cc5a51d5a54b2df2130f945 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -77,7 +77,7 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_guest_menu` WHERE action='online' LIMIT 1";
 
        // Unregister filter
-       UNREGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', true, !$dry_run);
+       UNREGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', true, $dry_run);
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -117,7 +117,7 @@ case "update": // Update an extension
                $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('online',NULL,'Jetzt Online','2','Y','N')";
 
                // Register filter
-               REGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', false, true, !$dry_run);
+               REGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', false, true, $dry_run);
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Hinzufügen des Menüpunktes "Jetzt Online" wird nun von dieser Erweiterung erledigt. Filter hinzugefügt.";

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 3197c40687fb3ed9e4545b5c38e7876712debfb0..4df2357071d8e20cee8dd5feac5c4d14d36b3e95 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -75,7 +75,7 @@ case "update": // Update an extension
        {
        case "0.1": // SQL queries for v0.1
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'";
-               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Mailbuchungen sind nun vom maximalen Empfang abhägig.";
@@ -83,7 +83,7 @@ case "update": // Update an extension
 
        case "0.1.1": // SQL queries for v0.1.1
                $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='config_order' LIMIT 1";
-               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
                $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_user_data` ADD mail_orders BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
 
                // Update notes (these will be set as task text!)

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index a765bdd1cbdf3604fe1fd22865eec7883b3f7665..4e697fc1f9f0dde48b6405ebf4bcce12645a64a5 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -112,7 +112,7 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_member_menu` WHERE what='rallyes' LIMIT 1";
 
        // Unregister filter
-       UNREGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, !$dry_run);
+       UNREGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, $dry_run);
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -311,7 +311,7 @@ Zudem sollten Sie mindestens folgende Templates (in <STRONG>templates/".GET_LANG
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // Register filter
-               REGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, !$dry_run);
+               REGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, $dry_run);
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.";

diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php
index 5e0556ae7f6c6f51778d77bd94ea43ec38d735a9..e1970b9f0f217ee9bb0bbbd3f696397106e98db9 100644 (file)
--- a/inc/extensions/ext-removeip.php
+++ b/inc/extensions/ext-removeip.php
@@ -67,7 +67,7 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='config_removeip' LIMIT 1";
 
        // Remove filters
-       UNREGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', true, !$dry_run);
+       UNREGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', true, $dry_run);
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -86,7 +86,7 @@ case "update": // Update an extension
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // Add filters
-               REGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', false, true, !$dry_run);
+               REGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', false, true, $dry_run);
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.";

diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php
index b5ab3794834a189493b663f5f6228227d5cfcc12..ade74b3c755b48e2beb8e7bc8f92231cd157cebc 100644 (file)
--- a/inc/extensions/ext-repair.php
+++ b/inc/extensions/ext-repair.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('repair', NULL, 'Reperaturen','7','Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')";
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('repair','repair_cats','Kategorieauswahlen','1','Repariert die Kategorieauswahlen Ihrer Mitglieder.')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair', NULL, 'Reperaturen','7','Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_cats','Kategorieauswahlen','1','Repariert die Kategorieauswahlen Ihrer Mitglieder.')";
        break;
 
 case "remove": // Do stuff when removing extension
@@ -73,9 +73,9 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
-               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('repair','repair_amenu','Admin-Menü', 2, 'Repariert die Gewichtung des Admin-Menü-Systems')";
-               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('repair','repair_gmenu','Gast-Menü', 3, 'Repariert die Gewichtung des Gäste-Menü-Systems')";
-               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('repair','repair_mmenu','Mitglied-Menü', 4, 'Repariert die Gewichtung des Mitglieder-Menü-Systems')";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_amenu','Admin-Menü', 2, 'Repariert die Gewichtung des Admin-Menü-Systems')";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_gmenu','Gast-Menü', 3, 'Repariert die Gewichtung des Gäste-Menü-Systems')";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_mmenu','Mitglied-Menü', 4, 'Repariert die Gewichtung des Mitglieder-Menü-Systems')";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt ein Menüpunkt zur Reperatur der Gewichtung des Admin-Menüs hinzu.";

diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php
index c03ef7ac2fb3fc8b9a9d086077b0357d8db24e71..6cee26970ab8e71fd305c5bbebf903446fa28a59 100644 (file)
--- a/inc/extensions/ext-task.php
+++ b/inc/extensions/ext-task.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('task', NULL, 'Aufgaben-Management','1','Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')";
-       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (action, what, title, sort, descr) VALUES ('task','list_task','Aufgaben auflisten','1','Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('task', NULL, 'Aufgaben-Management','1','Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')";
+       $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('task','list_task','Aufgaben auflisten','1','Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')";
        $SQLs[] = "UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE status='CLOSED'";
 
        // Enable CSS file?

diff --git a/inc/filters.php b/inc/filters.php
index 79f0ef4c6e31ae4925f166962a41b993abbce9df..fe843fb8f0a74f9ad1c1835985e69490ba1bea1d 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -130,7 +130,7 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
 }
 
 // "Registers" a new filter function
-function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $add = true) {
+function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) {
        global $filters, $counter;
 
        // Extend the filter function name
@@ -155,7 +155,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        } // END - if
 
        // Shall we add it?
-       if ($add) {
+       if (!$dry_run) {
                // Simply add it to the array
                $filters[$filterName][$filterFunction] = "Y";
                $counter[$filterName][$filterFunction] = 0;
@@ -163,7 +163,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
 }
 
 // "Unregisters" a filter from the given chain
-function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $remove = true) {
+function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_run = false) {
        global $filters, $counter, $loadedFilters;
 
        // Extend the filter function name only if not loaded from database
@@ -179,7 +179,7 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $remov
        } // END - if
 
        // Shall we remove? (default, not while just showing an extension removal)
-       if ($remove) {
+       if (!$dry_run) {
                // Mark for filter removal
                $filters[$filterName][$filterFunction] = "R";
                unset($counter[$filterName][$filterFunction]);

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 1c083863ec2e13a7dbf75d5f71d2148d5becaacd..392827f683f83953d2ebdf66529ee1023b17bc9b 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -427,13 +427,14 @@ function FILTER_CACHE_DESTROY_ALL () {
 
        // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
-               if ($cacheInstance->loadCacheFile("admins"))     $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("config"))     $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("extensions")) $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("mod_reg"))    $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("refdepths"))  $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("refsystem"))  $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("themes"))     $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("admins"))      $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("config"))      $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("extensions"))  $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("mod_reg"))     $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("refdepths"))   $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("refsystem"))   $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("themes"))      $cacheInstance->destroyCacheFile();
        } // END - if
 }