Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

[mailer.git] / inc / modules / member / what-surfbar_list.php

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 8879d19843799e931b173cab8ac2b1522f823d29..b9b9df87dd8662eb406e95db3c58d620d6101bac 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -37,10 +37,13 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL(URL."/modules.php?module=index");
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
+       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Load user URLs
 $URLs = SURFBAR_GET_USER_URLS();
@@ -49,8 +52,11 @@ $URLs = SURFBAR_GET_USER_URLS();
 if ((isset($_POST['ok'])) && (isset($_POST['action'])) && (isset($_POST['id']))) {
        // Process the form
        if (SURFBAR_MEMBER_DO_FORM($_POST, $URLs)) {
-               // Action performed
-               LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_ACTION_DONE);
+               // Action performed but shall we display it?
+               if ((($_POST['action'] != "edit") && ($_POST['action'] != "delete")) || (isset($_POST['execute']))) {
+                       // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
+                       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_ACTION_DONE);
+               } // END - if
        } else {
                // Something went wrong
                LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_ACTION_FAILED);