X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-surfbar_list.php;h=53851627638c08ff9d32d9670b37b7f9af2ec736;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hp=8879d19843799e931b173cab8ac2b1522f823d29;hpb=7f104f6fe558bb56b4205241435a2357c2feece1;p=mailer.git

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 8879d19843..5385162763 100644
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -36,11 +36,14 @@ if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif (!IS_MEMBER()) {
-	LOAD_URL(URL."/modules.php?module=index");
+	LOAD_URL("modules.php?module=index");
+} elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
+	addFatalMessage(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,11 +52,14 @@ $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, getMessage('MEMBER_SURFBAR_ACTION_DONE'));
+		} // END - if
 	} else {
 		// Something went wrong
-		LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_ACTION_FAILED);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SURFBAR_ACTION_FAILED'));
 	}
 } elseif (count($URLs) > 0) {
 	// List all URLs
@@ -64,7 +70,7 @@ if ((isset($_POST['ok'])) && (isset($_POST['action'])) && (isset($_POST['id'])))
 		$content['url'] = DEREFERER($content['url']);
 		if ($content['views_total'] > 0) {
 			// Include link to stats
-			$content['views_total'] = "[<a href=\"".URL."/modules.php?module=login&amp;what=surfbar_list\">".TRANSLATE_COMMA($content['views_total'])."</a>]";
+			$content['views_total'] = "[<a href=\"{!URL!}/modules.php?module=login&amp;what=surfbar_list\">".TRANSLATE_COMMA($content['views_total'])."</a>]";
 		} // END - if
 		$content['registered']  = MAKE_DATETIME($content['registered'], "2");
 		$content['last_locked'] = MAKE_DATETIME($content['last_locked'], "2");
@@ -86,7 +92,7 @@ if ((isset($_POST['ok'])) && (isset($_POST['action'])) && (isset($_POST['id'])))
 	LOAD_TEMPLATE("member_surfbar_list", false, $OUT);
 } else {
 	// No URLs booked so far
-	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_NO_URLS_FOUND);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SURFBAR_NO_URLS_FOUND'));
 }
 
 //