X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmod-watchdog.c;h=c70ab70233be1094e17cadbd6224e93cbe5e13d9;hb=ba891f830590ca957720345fd9dd66dfccc54c1f;hp=690ed0d2069d11cdb9531b44f141d7a6caf57ffb;hpb=3ef353beaf44f0b925f7868141f58cc7b02c85a7;p=srvx.git

diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c
index 690ed0d..c70ab70 100644
--- a/src/mod-watchdog.c
+++ b/src/mod-watchdog.c
@@ -285,20 +285,42 @@ static MODCMD_FUNC(cmd_listbad)
 static MODCMD_FUNC(cmd_register)
 {
     dict_iterator_t it;
+    struct modeNode *mn;
 
-    if((argc < 2) || !IsChannelName(argv[1]))
+    if(channel)
     {
-        reply("MSG_NOT_CHANNEL_NAME");
-        return 0;
-    }
 
-    if(opserv_bad_channel(argv[1]))
-    {
-        reply("CSMSG_ILLEGAL_CHANNEL", argv[1]);
-        return 0;
+        if(channel->bad_channel)
+        {
+            reply("CSMSG_ILLEGAL_CHANNEL", channel->name);
+            return 0;
+        }
+
+        if(!IsHelping(user)
+           && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP)))
+        {
+            reply("CSMSG_MUST_BE_OPPED", channel->name);
+            return 0;
+        }
+
     }
+    else
+    {
+
+        if((argc < 2) || !IsChannelName(argv[1]))
+        {
+            reply("MSG_NOT_CHANNEL_NAME");
+            return 0;
+        }
 
-    channel = AddChannel(argv[1], now, NULL, NULL);
+        if(opserv_bad_channel(argv[1]))
+        {
+            reply("CSMSG_ILLEGAL_CHANNEL", argv[1]);
+            return 0;
+        }
+
+        channel = AddChannel(argv[1], now, NULL, NULL);
+    }
 
     for (it = dict_first(chanlist); it; it = iter_next(it)) {
         struct watchdog_channel *chan = iter_data(it);
@@ -326,7 +348,9 @@ static MODCMD_FUNC(cmd_unregister)
     
     if(chan && chan->channel == channel) {
         //found, unregister it!
-        DelChannelUser(watchdog, channel, "unregistered.", 0);
+        char reason[MAXLEN];
+        sprintf(reason, "Unregistered by %s.", user->handle_info->handle);
+        DelChannelUser(watchdog, channel, reason, 0);
         dict_remove(chanlist, channel->name);
         reply("CSMSG_UNREG_SUCCESS", channel->name);
         return 1;
@@ -343,37 +367,39 @@ watchdog_detected_badword(struct userNode *user, struct chanNode *chan, struct b
     char *hostmask;
     char *reason = watchdog_conf.punishment_reason;
     char mask[IRC_NTOP_MAX_SIZE+3] = { '*', '@', '\0' };
-    switch(badword->action) {
-        case BADACTION_BAN:
-            hostmask = generate_hostmask(user, GENMASK_STRICT_HOST | GENMASK_ANY_IDENT);
-            sanitize_ircmask(hostmask);
-            if(chan->channel_info) {
-                //registered channel
-                add_channel_ban(chan->channel_info, hostmask, watchdog->nick, now, now, now + watchdog_conf.ban_duration, reason);
-            }
-            struct mod_chanmode change;
-            mod_chanmode_init(&change);
-            change.argc = 1;
-            change.args[0].mode = MODE_BAN;
-            change.args[0].u.hostmask = hostmask;
-            mod_chanmode_announce(watchdog, chan, &change);
-            free(hostmask);
-            
-        case BADACTION_KICK:
-            if(GetUserMode(chan, user))
-                KickChannelUser(user, chan, watchdog, reason);	
-            break;
-        case BADACTION_KILL:
-            DelUser(user, watchdog, 1, reason);
-            break;
-        case BADACTION_GLINE:
-            irc_ntop(mask + 2, sizeof(mask) - 2, &user->ip);
-            gline_add(watchdog->nick, mask, watchdog_conf.gline_duration, reason, now, now, 0, 1);
-            break;
-        default:
-            //error?
-            break;
-        }
+    if(!IsOper(user)) {
+		switch(badword->action) {
+			case BADACTION_BAN:
+				hostmask = generate_hostmask(user, GENMASK_STRICT_HOST | GENMASK_ANY_IDENT);
+				sanitize_ircmask(hostmask);
+				if(chan->channel_info) {
+					//registered channel
+					add_channel_ban(chan->channel_info, hostmask, watchdog->nick, now, now, now + watchdog_conf.ban_duration, reason);
+				}
+				struct mod_chanmode change;
+				mod_chanmode_init(&change);
+				change.argc = 1;
+				change.args[0].mode = MODE_BAN;
+				change.args[0].u.hostmask = hostmask;
+				mod_chanmode_announce(watchdog, chan, &change);
+				free(hostmask);
+
+			case BADACTION_KICK:
+				if(GetUserMode(chan, user))
+					KickChannelUser(user, chan, watchdog, reason);
+				break;
+			case BADACTION_KILL:
+				DelUser(user, watchdog, 1, reason);
+				break;
+			case BADACTION_GLINE:
+				irc_ntop(mask + 2, sizeof(mask) - 2, &user->ip);
+				gline_add(watchdog->nick, mask, watchdog_conf.gline_duration, reason, now, now, 0, 1);
+				break;
+			default:
+				//error?
+				break;
+			}
+    }
 }
 
 static void
@@ -615,7 +641,7 @@ watchdog_init(void)
     modcmd_register(watchdog_module, "delbad", cmd_delbad, 2, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
     modcmd_register(watchdog_module, "setbad", cmd_setbad, 2, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
     modcmd_register(watchdog_module, "listbad", cmd_listbad, 1, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
-    modcmd_register(watchdog_module, "register", cmd_register, 2, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
+    modcmd_register(watchdog_module, "register", cmd_register, 1, MODCMD_REQUIRE_AUTHED, "flags", "+acceptchan,+helping", NULL);
     modcmd_register(watchdog_module, "unregister", cmd_unregister, 1, MODCMD_REQUIRE_AUTHED | MODCMD_REQUIRE_CHANNEL, "flags", "+helping", NULL);
     message_register_table(msgtab);