diff --git a/htroot/Blacklist_p.html b/htroot/Blacklist_p.html index 77b900f84..21d8c2ecd 100644 --- a/htroot/Blacklist_p.html +++ b/htroot/Blacklist_p.html @@ -35,12 +35,12 @@ New list: - -active
+
+
diff --git a/htroot/Blacklist_p.java b/htroot/Blacklist_p.java index e380d446e..0fc10b939 100644 --- a/htroot/Blacklist_p.java +++ b/htroot/Blacklist_p.java @@ -128,21 +128,12 @@ public class Blacklist_p { } catch (IOException e) {} - } else if (post.containsKey("changebutton")) { - if (post.containsKey("proxylist")){ - if( !(post.get("proxylist").equals("on")) && listManager.ListInListslist(BLACKLIST_ACTIVE, filename) ){ + } else if (post.containsKey("activatelistbutton")) { + if( listManager.ListInListslist(BLACKLIST_ACTIVE, filename) ) { listManager.removeListFromListslist(BLACKLIST_ACTIVE, filename); - } else if ( post.get("proxylist").equals("on") && !(listManager.ListInListslist(BLACKLIST_ACTIVE, filename)) ) { // inactive list -> enable + } else { // inactive list -> enable listManager.addListToListslist(BLACKLIST_ACTIVE, filename); - } - } - if (post.containsKey("sharedlist")){ - if( !(post.get("sharedlist").equals("on")) && listManager.ListInListslist(BLACKLIST_SHARED, filename) ){ - listManager.removeListFromListslist(BLACKLIST_SHARED, filename); - } else if ( post.get("sharedlist").equals("on") && !(listManager.ListInListslist(BLACKLIST_SHARED, filename)) ) { // inSHARED list -> enable - listManager.addListToListslist(BLACKLIST_SHARED, filename); - } - } + } listManager.reloadBlacklists(); } else if (post.containsKey("sharelistbutton")) {