Don't allow web analytics if weblog admins untrusted
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
index df218e4..0cfe9a3 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
@@ -29,6 +29,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -62,7 +63,7 @@
// list of available plugins
private List<WeblogEntryPlugin> pluginsList = Collections.emptyList();
- private boolean weblogAdminsUntrusted = WebloggerRuntimeConfig.getBooleanProperty("weblogAdminsUntrusted");
+ private final boolean weblogAdminsUntrusted = WebloggerConfig.getBooleanProperty("weblogAdminsUntrusted");
public WeblogConfig() {
@@ -90,10 +91,7 @@
// set plugins list
PluginManager ppmgr = WebloggerFactory.getWeblogger().getPluginManager();
Map<String, WeblogEntryPlugin> pluginsMap = ppmgr.getWeblogEntryPlugins(getActionWeblog());
- List<WeblogEntryPlugin> plugins = new ArrayList<>();
- for (WeblogEntryPlugin entryPlugin : pluginsMap.values()) {
- plugins.add(entryPlugin);
- }
+ List<WeblogEntryPlugin> plugins = new ArrayList<>(pluginsMap.values());
// sort
setPluginsList(plugins);
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index b318ff3..46c3745 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -1759,6 +1759,7 @@
websiteSettings.spamPrevention=Spam Prevention
websiteSettings.ignoreUrls=List of words and regex expressions listed one per \
line to be added to the banned words list used to check comments, trackbacks and referrers.
+websiteSettings.bannedWordsList=Words banned in comments (regex allowed)
websiteSettings.acceptedBannedwordslist=Accepted {0} string and {1} regex banned-words list rules
websiteSettings.error.processingBannedwordslist=Error processing banned-words list: {0}
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
index 3465d40..c0437c7 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
@@ -130,7 +130,7 @@
<h3><s:text name="websiteSettings.spamPrevention"/></h3>
<s:textarea name="bean.bannedwordslist" rows="7" cols="40"
- label="%{getText('websiteSettings.analyticsTrackingCode')}"/>
+ label="%{getText('websiteSettings.bannedWordsList')}"/>
<%-- ***** Web analytics settings ***** --%>
