#include "modcmd.h"
#include "saxdb.h"
#include "timeq.h"
+#include "gline.h"
#define KEY_BADWORDS "badwords"
#define KEY_BADWORD_MASK "mask"
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);
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;
{
char *hostmask;
char *reason = watchdog_conf.punishment_reason;
- 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);
- }
- 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:
- KickChannelUser(user, chan, watchdog, reason);
- break;
- case BADACTION_KILL:
- DelUser(user, watchdog, 1, reason);
- break;
- case BADACTION_GLINE:
- int size = strlen(user->hostname) + 3;
- hostmask = alloca(size);
- snprintf(hostmask, size, "*@%s", user->hostname);
- gline_add(watchdog->nick, hostmask, watchdog_conf.gline_duration, reason, now, now, 0, 1);
- break;
- default:
- //error?
+ char mask[IRC_NTOP_MAX_SIZE+3] = { '*', '@', '\0' };
+ 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;
+ }
}
}
{
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)) {
struct record_data *rd = data;
if (rd->type == RECDB_OBJECT) {
- dict_t obj = GET_RECORD_OBJECT(rd);
+ //dict_t obj = GET_RECORD_OBJECT(rd);
/* nothing in here, yet */
add_channel(name);
static int
watchdog_saxdb_write(struct saxdb_context *ctx)
{
- char str[10];
dict_iterator_t it;
saxdb_write_int(ctx, KEY_BADWORDID, last_badword_id);
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);
projects / srvx.git / blobdiff