proxyscan: make scan notice optional

diff --git a/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/conf/ProxyscanConfiguration.java b/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/conf/ProxyscanConfiguration.java
index 676b2a11f3bac1c9d7e63ac211a820b835583d24..557dc6cb2bd08969450c7d053f14ea34725390fb 100644 (file)
--- a/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/conf/ProxyscanConfiguration.java
+++ b/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/conf/ProxyscanConfiguration.java
@@ -37,7 +37,6 @@ public class ProxyscanConfiguration extends Configuration
                Validator.validateNullOrNotEmpty("Proxyscan arguments", arguments);
                Validator.validateNotEmpty("Proxyscan check_string", check_string);
                Validator.validateNotEmpty("Proxyscan ban_message", ban_message);
-               Validator.validateNotEmpty("Proxyscan scan_notice", scan_notice);
                Validator.validateNotNull("Proxyscan py_opers", py_opers);
                Validator.validateChannelList("Proxyscan channels", channels);
        }

diff --git a/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/proxyscan.java b/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/proxyscan.java
index f40ac9e94ebcc994dec1261de54ac363ad4b1d33..4d6bbdf73b0c1b1b1eba9fd56e0a16aee8d754b0 100644 (file)
--- a/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/proxyscan.java
+++ b/proxyscan/src/main/java/net/rizon/moo/plugin/proxyscan/proxyscan.java
@@ -138,9 +138,12 @@ public class proxyscan extends Plugin implements EventListener
                        curIp = 0;
                String source = ips[curIp++];
 
-               String notice = conf.scan_notice.replace("%bindip%", source);
-               if (!notice.isEmpty())
-                       protocol.notice(nick, notice);
+               if (conf.scan_notice != null)
+               {
+                       String notice = conf.scan_notice.replace("%bindip%", source);
+                       if (!notice.isEmpty())
+                               protocol.notice(nick, notice);
+               }
 
                cache.addCacheEntry(ip);
                scan(source, ip);