diff --git a/htroot/xml/blacklists.java b/htroot/xml/blacklists.java index 4e0534de1..34f26adc2 100644 --- a/htroot/xml/blacklists.java +++ b/htroot/xml/blacklists.java @@ -35,29 +35,33 @@ public class blacklists { listManager.listsPath = new File(listManager.switchboard.getRootPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS")); final List dirlist = listManager.getDirListing(listManager.listsPath); int blacklistCount=0; + + final String blackListName = post.get("listname", ""); List list; int count; if (dirlist != null) { for (String element : dirlist) { - prop.putXML("lists_" + blacklistCount + "_name", element); - - if (listManager.listSetContains("BlackLists.Shared", element)) { + if (blackListName.equals("") || element.equals(blackListName)) { + prop.putXML("lists_" + blacklistCount + "_name", element); + + if (listManager.listSetContains("BlackLists.Shared", element)) { - list = listManager.getListArray(new File(listManager.listsPath, element)); + list = listManager.getListArray(new File(listManager.listsPath, element)); - count=0; - for (int j=0;j dirlist = listManager.getDirListing(listManager.listsPath); int blacklistCount=0; - + + final String blackListName = post.get("listname", ""); + List list; int count; if (dirlist != null) { for (String element : dirlist) { - prop.putXML("lists_" + blacklistCount + "_name", element); - - if (listManager.listSetContains("BlackLists.Shared", element)) { - prop.put("lists_" + blacklistCount + "_shared", "1"); - } else { - prop.put("lists_" + blacklistCount + "_shared", "0"); - } - - final String[] types = indexAbstractReferenceBlacklist.BLACKLIST_TYPES_STRING.split(","); - for (int j=0; j env) { if (post == null || env == null) throw new NullPointerException("post: " + post + ", sb: " + env); final plasmaSwitchboard sb = (plasmaSwitchboard) env; - + + final String blackListName = post.get("listname", ""); + // return variable that accumulates replacements final serverObjects prop = new serverObjects(); if ((post == null) || (env == null)) return prop; @@ -73,9 +75,11 @@ public final class list { if (filenamesarray.length > 0){ for (int i = 0;i < filenamesarray.length; i++) { - final String filename = filenamesarray[i]; - final File fileObj = new File(listsPath,filename); - out.append(listManager.getListString(fileObj, false)).append(serverCore.CRLF_STRING); + if (blackListName.equals("") || filenamesarray[i].equals(blackListName)) { + final String filename = filenamesarray[i]; + final File fileObj = new File(listsPath,filename); + out.append(listManager.getListString(fileObj, false)).append(serverCore.CRLF_STRING); + } } }