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
+ {
- channel = AddChannel(argv[1], now, NULL, NULL);
+ if((argc < 2) || !IsChannelName(argv[1]))
+ {
+ reply("MSG_NOT_CHANNEL_NAME");
+ return 0;
+ }
+
+ 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);
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;
free(hostmask);
case BADACTION_KICK:
- KickChannelUser(user, chan, watchdog, reason);
+ if(GetUserMode(chan, user))
+ KickChannelUser(user, chan, watchdog, reason);
break;
case BADACTION_KILL:
DelUser(user, watchdog, 1, reason);
{
dict_iterator_t it;
- if(!watchdog)
+ if(!watchdog || !dict_find(chanlist, chan->name, NULL))
return;
for (it = dict_first(shitlist); it; it = iter_next(it)) {
saxdb_start_record(ctx, KEY_BADWORDS, 1);
for (it = dict_first(shitlist); it; it = iter_next(it)) {
struct badword *badword = iter_data(it);
- saxdb_start_record(ctx, iter_key(it), 0);
-
- saxdb_write_string(ctx, KEY_BADWORD_MASK, badword->badword_mask);
- saxdb_write_int(ctx, KEY_BADWORD_TRIGGERED, badword->triggered);
- saxdb_write_int(ctx, KEY_BADWORD_ACTION, badword->action);
-
- saxdb_end_record(ctx);
+ if(badword && badword->badword_mask) {
+ saxdb_start_record(ctx, iter_key(it), 0);
+
+ saxdb_write_string(ctx, KEY_BADWORD_MASK, badword->badword_mask);
+ saxdb_write_int(ctx, KEY_BADWORD_TRIGGERED, badword->triggered);
+ saxdb_write_int(ctx, KEY_BADWORD_ACTION, badword->action);
+
+ saxdb_end_record(ctx);
+ }
}
saxdb_end_record(ctx);
}
saxdb_start_record(ctx, KEY_CHANNELS, 1);
for (it = dict_first(chanlist); it; it = iter_next(it)) {
struct watchdog_channel *wc = iter_data(it);
- saxdb_start_record(ctx, wc->channel->name, 0);
- //anything else?
- saxdb_end_record(ctx);
+ if(wc && wc->channel && wc->channel->name) {
+ saxdb_start_record(ctx, wc->channel->name, 0);
+ //anything else?
+ saxdb_end_record(ctx);
+ }
}
saxdb_end_record(ctx);
}
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);