X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/19fe6b99408a97e6a79b2a79b405bf7923c08e80..c52666c622943a65d7dff6b972b24511b34e7828:/src/chanserv.c?ds=inline diff --git a/src/chanserv.c b/src/chanserv.c index 7f75737..4c572e8 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1,7 +1,7 @@ /* chanserv.c - Channel service bot * Copyright 2000-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -131,9 +131,9 @@ static const struct message_entry msgtab[] = { /* Do-not-register channels */ { "CSMSG_NOT_DNR", "$b%s$b is not a valid channel name or *account." }, - { "CSMSG_DNR_SEARCH_RESULTS", "The following do-not-registers were found:" }, - { "CSMSG_DNR_INFO", "$b%s$b is do-not-register (by $b%s$b): %s" }, - { "CSMSG_DNR_INFO_SET", "$b%s$b is do-not-register (set %s by $b%s$b): %s" }, + { "CSMSG_DNR_SEARCH_RESULTS", "$bDo-Not-Register Channels$b" }, + { "CSMSG_DNR_INFO", "$b%s$b (set by $b%s$b): %s" }, + { "CSMSG_DNR_INFO_SET", "$b%s$b (set %s ago by $b%s$b): %s" }, { "CSMSG_MORE_DNRS", "%d more do-not-register entries skipped." }, { "CSMSG_DNR_CHANNEL", "Only network staff may register $b%s$b." }, { "CSMSG_DNR_CHANNEL_MOVE", "Only network staff may move $b%s$b." }, @@ -184,13 +184,13 @@ static const struct message_entry msgtab[] = { { "CSMSG_DELETED_YOU", "Your $b%d$b access has been deleted from $b%s$b." }, /* User management */ - { "CSMSG_ADDED_USER", "Added %s to the %s user list with access %d." }, + { "CSMSG_ADDED_USER", "Added %s to the %s user list with access %s (%d)." }, { "CSMSG_DELETED_USER", "Deleted %s (with access %d) from the %s user list." }, { "CSMSG_BAD_RANGE", "Invalid access range; minimum (%d) must be greater than maximum (%d)." }, { "CSMSG_DELETED_USERS", "Deleted accounts matching $b%s$b with access from $b%d$b to $b%d$b from the %s user list." }, { "CSMSG_TRIMMED_USERS", "Trimmed $b%d users$b with access from %d to %d from the %s user list who were inactive for at least %s." }, - { "CSMSG_INCORRECT_ACCESS", "%s has access $b%d$b, not %s." }, - { "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with access %d)." }, + { "CSMSG_INCORRECT_ACCESS", "%s has access $b%s$b, not %s." }, + { "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with %s access)." }, { "CSMSG_CANNOT_TRIM", "You must include a minimum inactivity duration of at least 60 seconds to trim." }, { "CSMSG_NO_SELF_CLVL", "You cannot change your own access." }, @@ -228,7 +228,7 @@ static const struct message_entry msgtab[] = { { "CSMSG_TOPIC_SET", "Topic is now '%s'." }, { "CSMSG_NO_TOPIC", "$b%s$b does not have a default topic." }, { "CSMSG_TOPICMASK_CONFLICT1", "I do not know how to make that topic work with the current topic mask in $b%s$b, which is: %s" }, - { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic at most %d characters and matches the topic mask pattern." }, + { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic is at most %d characters and matches the topic mask pattern." }, { "CSMSG_TOPIC_LOCKED", "The %s topic is locked." }, { "CSMSG_MASK_BUT_NO_TOPIC", "Warning: $b%s$b does not have a default topic, but you just set the topic mask." }, { "CSMSG_TOPIC_MISMATCH", "Warning: The default topic for $b%s$b does not match the topic mask; changing it anyway." }, @@ -319,10 +319,11 @@ static const struct message_entry msgtab[] = { { "CSMSG_BANS_REMOVED", "Removed all channel bans from $b%s$b." }, /* Channel userlist */ - { "CSMSG_ACCESS_ALL_HEADER", "%s users from level %d to %d:" }, - { "CSMSG_ACCESS_SEARCH_HEADER", "%s users from level %d to %d matching %s:" }, + { "CSMSG_ACCESS_ALL_HEADER", "$b%s Users From Level %s To %s$b" }, + { "CSMSG_ACCESS_SEARCH_HEADER", "$b%s Users From Level %s To %s Matching %s$b" }, { "CSMSG_INVALID_ACCESS", "$b%s$b is an invalid access level." }, - { "CSMSG_CHANGED_ACCESS", "%s now has access $b%d$b in %s." }, + { "CSMSG_CHANGED_ACCESS", "%s now has access $b%s$b (%u) in %s." }, + { "CSMSG_BANS_HEADER", "$bBans in %s$b" }, /* Channel note list */ { "CSMSG_NOTELIST_HEADER", "Notes for $b%s$b:" }, @@ -356,9 +357,9 @@ static const struct message_entry msgtab[] = { { "CSMSG_SQUAT_ACCESS", "$b%s$b does not have access to any channels." }, { "CSMSG_INFOLINE_LIST", "Showing all channel entries for account $b%s$b:" }, { "CSMSG_USER_NO_ACCESS", "%s lacks access to %s." }, - { "CSMSG_USER_HAS_ACCESS", "%s has access $b%d$b in %s." }, + { "CSMSG_USER_HAS_ACCESS", "%s has $b%s$b access (%d) in %s." }, { "CSMSG_HELPER_NO_ACCESS", "%s lacks access to %s but has $bsecurity override$b enabled." }, - { "CSMSG_HELPER_HAS_ACCESS", "%s has access $b%d$b in %s and has $bsecurity override$b enabled." }, + { "CSMSG_HELPER_HAS_ACCESS", "%s has $b%s$b access (%d) in %s and has $bsecurity override$b enabled." }, { "CSMSG_LAZY_SMURF_TARGET", "%s is %s ($bIRCOp$b; not logged in)." }, { "CSMSG_SMURF_TARGET", "%s is %s ($b%s$b)." }, { "CSMSG_LAME_SMURF_TARGET", "%s is an IRC operator." }, @@ -374,7 +375,8 @@ static const struct message_entry msgtab[] = { { "CSMSG_END_NAMES", "End of names in $b%s$b" }, /* Channel information */ - { "CSMSG_CHANNEL_INFO", "$b%s$b Information:" }, + { "CSMSG_CHANNEL_INFO", "$bInformation About %s$b" }, + { "CSMSG_BAR", "----------------------------------------"}, { "CSMSG_CHANNEL_TOPIC", "$bDefault Topic: $b%s" }, { "CSMSG_CHANNEL_MODES", "$bMode Lock: $b%s" }, { "CSMSG_CHANNEL_NOTE", "$b%s:%*s$b%s" }, @@ -395,13 +397,15 @@ static const struct message_entry msgtab[] = { { "CSMSG_CHANNEL_SUSPENDED_7", " %s ago by %s; revoked %s ago: %s" }, { "CSMSG_CHANNEL_REGISTERED", "$bRegistered: $b%s ago." }, { "CSMSG_CHANNEL_VISITED", "$bVisited: $b%s ago." }, + { "CSMSG_CHANNEL_END", "---------------End of Info--------------"}, - { "CSMSG_PEEK_INFO", "$b%s$b Status:" }, + { "CSMSG_PEEK_INFO", "$bStatus of %s$b" }, { "CSMSG_PEEK_TOPIC", "$bTopic: $b%s" }, { "CSMSG_PEEK_MODES", "$bModes: $b%s" }, { "CSMSG_PEEK_USERS", "$bTotal users: $b%d" }, { "CSMSG_PEEK_OPS", "$bOps:$b" }, { "CSMSG_PEEK_NO_OPS", "$bOps: $bNone present" }, + { "CSMSG_PEEK_END", "-------------End of Status--------------" }, /* Network information */ { "CSMSG_NETWORK_INFO", "Network Information:" }, @@ -423,11 +427,12 @@ static const struct message_entry msgtab[] = { { "CSMSG_ACTION_INVALID", "$b%s$b is not a recognized search action." }, { "CSMSG_UNVISITED_HEADER", "Showing a maximum of %d channels unvisited for $b%s$b:" }, { "CSMSG_UNVISITED_DATA", "%s: $b%s$b" }, - { "CSMSG_CHANNEL_SEARCH_RESULTS", "The following channels were found:" }, + { "CSMSG_CHANNEL_SEARCH_RESULTS", "$bChannels Found Matching Search$b" }, /* Channel configuration */ { "CSMSG_INVALID_OPTION", "$b%s$b is not a valid %s option." }, - { "CSMSG_CHANNEL_OPTIONS", "Channel Options:" }, + { "CSMSG_CHANNEL_OPTIONS", "$bChannel Options for %s$b" }, + { "CSMSG_CHANNEL_OPTIONS_END", "-------------End of Options-------------" }, { "CSMSG_GREETING_TOO_LONG", "Your greeting ($b%d$b characters) must be shorter than $b%d$b characters." }, /* User settings */ @@ -447,7 +452,7 @@ static const struct message_entry msgtab[] = { { "CSMSG_HUGGLES_YOU", "\001ACTION huggles you\001" }, /* Other things */ - { "CSMSG_EVENT_SEARCH_RESULTS", "The following channel events were found:" }, + { "CSMSG_EVENT_SEARCH_RESULTS", "$bChannel Events for %s$b" }, { NULL, NULL } }; @@ -467,7 +472,7 @@ static const struct message_entry msgtab[] = { #define CSFUNC_ARGS user, channel, argc, argv, cmd #define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME) -#define CHANSERV_SYNTAX() svccmd_send_help(user, chanserv, cmd) +#define CHANSERV_SYNTAX() svccmd_send_help_brief(user, chanserv, cmd) #define REQUIRE_PARAMS(N) if(argc < (N)) { \ reply("MSG_MISSING_PARAMS", argv[0]); \ CHANSERV_SYNTAX(); \ @@ -509,8 +514,6 @@ static struct unsigned int max_chan_bans; unsigned int max_userinfo_length; - unsigned int use_registered_mode; - struct string_list *set_shows; struct string_list *eightball; struct string_list *old_ban_names; @@ -577,7 +580,7 @@ static const struct { char *title; unsigned short level; char ch; -} accessLevels[] = { +} accessLevels[] = { /* MUST be orderd less to most! */ { "peon", "Peon", UL_PEON, '+' }, { "halfop", "HalfOp", UL_HALFOP, '%' }, { "op", "Op", UL_OP, '@' }, @@ -672,6 +675,22 @@ user_level_from_name(const char *name, unsigned short clamp_level) return level; } +char * +user_level_name_from_level(int level) +{ + unsigned int ii; + char* highest; + + highest = "None"; + if(level >= 1) + highest = "Peon"; + for(ii = 0; (ii < ArrayLength(accessLevels)); ii++) + if(level >= accessLevels[ii].level) + highest = accessLevels[ii].title; + return(highest); +} + + int parse_level_range(unsigned short *minl, unsigned short *maxl, const char *arg) { @@ -1214,7 +1233,7 @@ add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t safestrncpy(bd->mask, mask, sizeof(bd->mask)); if(owner) safestrncpy(bd->owner, owner, sizeof(bd->owner)); - bd->reason = reason ? strdup(reason) : NULL; + bd->reason = strdup(reason); if(expires) timeq_add(expires, expire_ban, bd); @@ -1302,7 +1321,7 @@ unregister_channel(struct chanData *channel, const char *reason) timeq_del(0, NULL, channel, TIMEQ_IGNORE_FUNC | TIMEQ_IGNORE_WHEN); - if(chanserv_conf.use_registered_mode) + if(off_channel > 0) { mod_chanmode_init(&change); change.modes_clear |= MODE_REGISTERED; @@ -1527,14 +1546,14 @@ chanserv_add_dnr(const char *chan_name, const char *setter, const char *reason) } static struct dnrList -chanserv_find_dnrs(const char *chan_name, struct handle_info *handle) +chanserv_find_dnrs(const char *chan_name, const char *handle) { struct dnrList list; dict_iterator_t it; struct do_not_register *dnr; dnrList_init(&list); - if(handle && (dnr = dict_find(handle_dnrs, handle->handle, NULL))) + if(handle && (dnr = dict_find(handle_dnrs, handle, NULL))) dnrList_append(&list, dnr); if(chan_name && (dnr = dict_find(plain_dnrs, chan_name, NULL))) dnrList_append(&list, dnr); @@ -1546,7 +1565,7 @@ chanserv_find_dnrs(const char *chan_name, struct handle_info *handle) } static unsigned int -chanserv_show_dnrs(struct userNode *user, struct svccmd *cmd, const char *chan_name, struct handle_info *handle) +chanserv_show_dnrs(struct userNode *user, struct svccmd *cmd, const char *chan_name, const char *handle) { struct dnrList list; struct do_not_register *dnr; @@ -1602,6 +1621,7 @@ static CHANSERV_FUNC(cmd_noregister) dict_iterator_t it; reply("CSMSG_DNR_SEARCH_RESULTS"); + reply("CSMSG_BAR"); matches = 0; for(it = dict_first(handle_dnrs); it; it = iter_next(it)) { @@ -1660,8 +1680,9 @@ static CHANSERV_FUNC(cmd_noregister) } reply("CSMSG_DNR_SEARCH_RESULTS"); + reply("CSMSG_BAR"); if(*target == '*') - matches = chanserv_show_dnrs(user, cmd, NULL, get_handle_info(target + 1)); + matches = chanserv_show_dnrs(user, cmd, NULL, target + 1); else matches = chanserv_show_dnrs(user, cmd, target, NULL); if(!matches) @@ -1710,7 +1731,6 @@ chanserv_get_owned_count(struct handle_info *hi) static CHANSERV_FUNC(cmd_register) { - struct mod_chanmode *change; struct handle_info *handle; struct chanData *cData; struct modeNode *mn; @@ -1733,7 +1753,8 @@ static CHANSERV_FUNC(cmd_register) return 0; } - if(!IsHelping(user) && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP))) + if(!IsHelping(user) + && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP))) { reply("CSMSG_MUST_BE_OPPED", channel->name); return 0; @@ -1744,7 +1765,13 @@ static CHANSERV_FUNC(cmd_register) } else { - if((argc < 2) || !IsChannelName(argv[1])) + if(argc < 2) + { + reply("MSG_MISSING_PARAMS", cmd->name); + svccmd_send_help_brief(user, chanserv, cmd); + return 0; + } + if(!IsChannelName(argv[1])) { reply("MSG_NOT_CHANNEL_NAME"); return 0; @@ -1783,7 +1810,7 @@ static CHANSERV_FUNC(cmd_register) if(!IsHelping(user)) reply("CSMSG_DNR_CHANNEL", chan_name); else - chanserv_show_dnrs(user, cmd, chan_name, handle); + chanserv_show_dnrs(user, cmd, chan_name, handle->handle); return 0; } @@ -1799,14 +1826,21 @@ static CHANSERV_FUNC(cmd_register) cData = register_channel(channel, user->handle_info->handle); scan_user_presence(add_channel_user(cData, handle, UL_OWNER, 0, NULL), NULL); cData->modes = chanserv_conf.default_modes; - if(chanserv_conf.use_registered_mode) + if(off_channel > 0) cData->modes.modes_set |= MODE_REGISTERED; - change = mod_chanmode_dup(&cData->modes, 1); - change->args[change->argc].mode = MODE_CHANOP; - change->args[change->argc].u.member = AddChannelUser(chanserv, channel); - change->argc++; - mod_chanmode_announce(chanserv, channel, change); - mod_chanmode_free(change); + if (IsOffChannel(cData)) + { + mod_chanmode_announce(chanserv, channel, &cData->modes); + } + else + { + struct mod_chanmode *change = mod_chanmode_dup(&cData->modes, 1); + change->args[change->argc].mode = MODE_CHANOP; + change->args[change->argc].u.member = AddChannelUser(chanserv, channel); + change->argc++; + mod_chanmode_announce(chanserv, channel, change); + mod_chanmode_free(change); + } /* Initialize the channel's max user record. */ cData->max = channel->members.used; @@ -1891,6 +1925,7 @@ static CHANSERV_FUNC(cmd_unregister) static CHANSERV_FUNC(cmd_move) { + struct mod_chanmode change; struct chanNode *target; struct modeNode *mn; struct userData *uData; @@ -1926,12 +1961,13 @@ static CHANSERV_FUNC(cmd_move) if(!IsHelping(user)) reply("CSMSG_DNR_CHANNEL_MOVE", argv[1]); else - chanserv_show_dnrs(user, cmd, argv[1], uData->handle); + chanserv_show_dnrs(user, cmd, argv[1], uData->handle->handle); return 0; } } } + mod_chanmode_init(&change); if(!(target = GetChannel(argv[1]))) { target = AddChannel(argv[1], now, NULL, NULL, NULL); @@ -1951,14 +1987,23 @@ static CHANSERV_FUNC(cmd_move) } else if(!IsSuspended(channel->channel_info)) { - struct mod_chanmode change; - mod_chanmode_init(&change); change.argc = 1; change.args[0].mode = MODE_CHANOP; change.args[0].u.member = AddChannelUser(chanserv, target); mod_chanmode_announce(chanserv, target, &change); } + if(off_channel > 0) + { + /* Clear MODE_REGISTERED from old channel, add it to new. */ + change.argc = 0; + change.modes_clear = MODE_REGISTERED; + mod_chanmode_announce(chanserv, channel, &change); + change.modes_clear = 0; + change.modes_set = MODE_REGISTERED; + mod_chanmode_announce(chanserv, target, &change); + } + /* Move the channel_info to the target channel; it shouldn't be necessary to clear timeq callbacks for the old channel. */ @@ -2257,13 +2302,13 @@ static CHANSERV_FUNC(cmd_adduser) if((actee = GetTrueChannelAccess(channel->channel_info, handle))) { - reply("CSMSG_USER_EXISTS", handle->handle, channel->name, actee->access); + reply("CSMSG_USER_EXISTS", handle->handle, channel->name, user_level_name_from_level(actee->access)); return 0; } actee = add_channel_user(channel->channel_info, handle, access, 0, NULL); scan_user_presence(actee, NULL); - reply("CSMSG_ADDED_USER", handle->handle, channel->name, access); + reply("CSMSG_ADDED_USER", handle->handle, channel->name, user_level_name_from_level(access), access); return 1; } @@ -2315,7 +2360,7 @@ static CHANSERV_FUNC(cmd_clvl) } victim->access = new_access; - reply("CSMSG_CHANGED_ACCESS", handle->handle, new_access, channel->name); + reply("CSMSG_CHANGED_ACCESS", handle->handle, user_level_name_from_level(new_access), new_access, channel->name); return 1; } @@ -2350,7 +2395,7 @@ static CHANSERV_FUNC(cmd_deluser) } if(access != victim->access) { - reply("CSMSG_INCORRECT_ACCESS", handle->handle, victim->access, argv[1]); + reply("CSMSG_INCORRECT_ACCESS", handle->handle, user_level_name_from_level(victim->access), argv[1]); return 0; } } @@ -3110,8 +3155,9 @@ find_matching_bans(struct banList *bans, struct userNode *actee, const char *mas if(!match[ii]) continue; change->args[count].mode = MODE_REMOVE | MODE_BAN; - change->args[count++].u.hostmask = bans->list[ii]->ban; + change->args[count++].u.hostmask = strdup(bans->list[ii]->ban); } + assert(count == change->argc); return change; } @@ -3144,6 +3190,10 @@ unban_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c change = find_matching_bans(&channel->banlist, actee, mask); if(change) { + unsigned int ii; + + for(ii = 0; ii < change->argc; ++ii) + free((char*)change->args[ii].u.hostmask); modcmd_chanmode_announce(change); mod_chanmode_free(change); acted = 1; @@ -3221,9 +3271,11 @@ static CHANSERV_FUNC(cmd_unbanall) for(ii=0; iibanlist.used; ii++) { change->args[ii].mode = MODE_REMOVE | MODE_BAN; - change->args[ii].u.hostmask = channel->banlist.list[ii]->ban; + change->args[ii].u.hostmask = strdup(channel->banlist.list[ii]->ban); } modcmd_chanmode_announce(change); + for(ii = 0; ii < change->argc; ++ii) + free((char*)change->args[ii].u.hostmask); mod_chanmode_free(change); reply("CSMSG_BANS_REMOVED", channel->name); return 1; @@ -3232,6 +3284,7 @@ static CHANSERV_FUNC(cmd_unbanall) static CHANSERV_FUNC(cmd_open) { struct mod_chanmode *change; + unsigned int ii; change = find_matching_bans(&channel->banlist, user, NULL); if(!change) @@ -3242,6 +3295,8 @@ static CHANSERV_FUNC(cmd_open) change->modes_clear &= ~channel->channel_info->modes.modes_set; modcmd_chanmode_announce(change); reply("CSMSG_CHANNEL_OPENED", channel->name); + for(ii = 0; ii < change->argc; ++ii) + free((char*)change->args[ii].u.hostmask); mod_chanmode_free(change); return 1; } @@ -3404,7 +3459,7 @@ static CHANSERV_FUNC(cmd_access) && ((target_handle->opserv_level >= chanserv_conf.nodelete_level) || !IsProtected(channel->channel_info)); if((uData = GetTrueChannelAccess(channel->channel_info, target_handle))) { - reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, uData->access, channel->name); + reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, user_level_name_from_level(uData->access), uData->access, channel->name); /* To prevent possible information leaks, only show infolines * if the requestor is in the channel or it's their own * handle. */ @@ -3429,6 +3484,7 @@ static CHANSERV_FUNC(cmd_access) return 1; } +/* This is never used... */ static void zoot_list(struct listData *list) { @@ -3440,9 +3496,9 @@ zoot_list(struct listData *list) if(list->table.length == 1) { if(list->search) - send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, list->lowest, list->highest, list->search); + send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search); else - send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, list->lowest, list->highest); + send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest)); msg = user_find_message(list->user, "MSG_NONE"); send_message_type(4, list->user, list->bot, " %s", msg); } @@ -3463,9 +3519,9 @@ zoot_list(struct listData *list) if((curr == list->table.length) || (list->users[curr-1]->access < lowest)) { if(list->search) - send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, lowest, highest, list->search); + send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(lowest), user_level_name_from_level(highest), list->search); else - send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, lowest, highest); + send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(lowest), user_level_name_from_level(highest)); temp = list->table.contents[--start]; list->table.contents[start] = list->table.contents[0]; tmp_table.contents = list->table.contents + start; @@ -3484,9 +3540,9 @@ def_list(struct listData *list) { const char *msg; if(list->search) - send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, list->lowest, list->highest, list->search); + send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search); else - send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, list->lowest, list->highest); + send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest)); table_send(list->bot, list->user->nick, 0, NULL, list->table); if(list->table.length == 1) { @@ -3524,8 +3580,10 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg lData.highest = highest; lData.search = (argc > 1) ? argv[1] : NULL; send_list = def_list; + /* What does the following line do exactly?? */ (void)zoot_list; /* since it doesn't show user levels */ + /* this does nothing!! -rubin if(user->handle_info) { switch(user->handle_info->userlist_style) @@ -3534,6 +3592,7 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg case HI_STYLE_ZOOT: send_list = def_list; break; } } + */ lData.users = alloca(channel->channel_info->userCount * sizeof(struct userData *)); matches = 0; @@ -3548,15 +3607,16 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg qsort(lData.users, matches, sizeof(lData.users[0]), userData_access_comp); lData.table.length = matches+1; - lData.table.width = 4; + lData.table.width = 5; lData.table.flags = TABLE_NO_FREE; lData.table.contents = malloc(lData.table.length*sizeof(*lData.table.contents)); ary = malloc(lData.table.width*sizeof(**lData.table.contents)); lData.table.contents[0] = ary; ary[0] = "Access"; - ary[1] = "Account"; - ary[2] = "Last Seen"; - ary[3] = "Status"; + ary[1] = "Level"; + ary[2] = "Account"; + ary[3] = "Last Seen"; + ary[4] = "Status"; for(matches = 1; matches < lData.table.length; ++matches) { struct userData *uData = lData.users[matches-1]; @@ -3564,26 +3624,30 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg ary = malloc(lData.table.width*sizeof(**lData.table.contents)); lData.table.contents[matches] = ary; - ary[0] = strtab(uData->access); - ary[1] = uData->handle->handle; + /* ary[0] = strtab(uData->access);*/ + ary[0] = user_level_name_from_level(uData->access); + /* TODO: replace above with func that returns static string + * of userlevel for that level. eg OP/MANAGER etc. -rubin */ + ary[1] = strtab(uData->access); + ary[2] = uData->handle->handle; if(uData->present) - ary[2] = "Here"; + ary[3] = "Here"; else if(!uData->seen) - ary[2] = "Never"; + ary[3] = "Never"; else - ary[2] = intervalString(seen, now - uData->seen, user->handle_info); - ary[2] = strdup(ary[2]); + ary[3] = intervalString(seen, now - uData->seen, user->handle_info); + ary[3] = strdup(ary[3]); if(IsUserSuspended(uData)) - ary[3] = "Suspended"; + ary[4] = "Suspended"; else if(HANDLE_FLAGGED(uData->handle, FROZEN)) - ary[3] = "Vacation"; + ary[4] = "Vacation"; else - ary[3] = "Normal"; + ary[4] = "Normal"; } send_list(&lData); for(matches = 1; matches < lData.table.length; ++matches) { - free((char*)lData.table.contents[matches][2]); + free((char*)lData.table.contents[matches][3]); free(lData.table.contents[matches]); } free(lData.table.contents[0]); @@ -3639,6 +3703,7 @@ static CHANSERV_FUNC(cmd_bans) else search = NULL; + reply("CSMSG_BANS_HEADER", channel->name); bans = alloca(channel->channel_info->banCount * sizeof(struct banData *)); for(ban = channel->channel_info->bans; ban; ban = ban->next) @@ -3705,7 +3770,7 @@ static CHANSERV_FUNC(cmd_bans) tbl.contents[ii][3] = ban->reason; } table_send(cmd->parent->bot, user->nick, 0, NULL, tbl); - reply("MSG_MATCH_COUNT", matches); + /* reply("MSG_MATCH_COUNT", matches); */ for(ii = 1; ii < tbl.length; ++ii) { free((char*)tbl.contents[ii][2]); @@ -3970,6 +4035,7 @@ static CHANSERV_FUNC(cmd_info) cData = channel->channel_info; reply("CSMSG_CHANNEL_INFO", channel->name); + reply("CSMSG_BAR"); uData = GetChannelUser(cData, user->handle_info); if(uData && (uData->access >= cData->lvlOpts[lvlGiveOps])) @@ -4019,6 +4085,7 @@ static CHANSERV_FUNC(cmd_info) reply("CSMSG_CHANNEL_SUSPENDED", channel->name); show_suspension_info(cmd, user, cData->suspended); } + reply("CSMSG_CHANNEL_END"); return 1; } @@ -4105,6 +4172,7 @@ static CHANSERV_FUNC(cmd_peek) irc_make_chanmode(channel, modes); reply("CSMSG_PEEK_INFO", channel->name); + reply("CSMSG_BAR"); reply("CSMSG_PEEK_TOPIC", channel->topic); reply("CSMSG_PEEK_MODES", modes); reply("CSMSG_PEEK_USERS", channel->members.used); @@ -4129,6 +4197,7 @@ static CHANSERV_FUNC(cmd_peek) } else reply("CSMSG_PEEK_NO_OPS"); + reply("CSMSG_PEEK_END"); return 1; } @@ -4461,7 +4530,8 @@ static CHANSERV_FUNC(cmd_events) discrim.severities = 1 << LOG_COMMAND; report.reporter = chanserv; report.user = user; - reply("CSMSG_EVENT_SEARCH_RESULTS"); + reply("CSMSG_EVENT_SEARCH_RESULTS", channel->name); + reply("CSMSG_BAR"); matches = log_entry_search(&discrim, log_report_entry, &report); if(matches) reply("MSG_MATCH_COUNT", matches); @@ -4535,18 +4605,21 @@ chanserv_expire_suspension(void *data) { struct suspended *suspended = data; struct chanNode *channel; - struct mod_chanmode change; if(!suspended->expires || (now < suspended->expires)) suspended->revoked = now; channel = suspended->cData->channel; suspended->cData->channel = channel; suspended->cData->flags &= ~CHANNEL_SUSPENDED; - mod_chanmode_init(&change); - change.argc = 1; - change.args[0].mode = MODE_CHANOP; - change.args[0].u.member = AddChannelUser(chanserv, channel); - mod_chanmode_announce(chanserv, channel, &change); + if(!IsOffChannel(suspended->cData)) + { + struct mod_chanmode change; + mod_chanmode_init(&change); + change.argc = 1; + change.args[0].mode = MODE_CHANOP; + change.args[0].u.member = AddChannelUser(chanserv, channel); + mod_chanmode_announce(chanserv, channel, &change); + } } static CHANSERV_FUNC(cmd_csuspend) @@ -4793,7 +4866,10 @@ static CHANSERV_FUNC(cmd_search) search->limit = INT_MAX; if(action == search_print) + { reply("CSMSG_CHANNEL_SEARCH_RESULTS"); + reply("CSMSG_BAR"); + } matches = chanserv_channel_search(search, action, user); @@ -5362,12 +5438,14 @@ static CHANSERV_FUNC(cmd_set) if(argc < 2) { - reply("CSMSG_CHANNEL_OPTIONS"); + reply("CSMSG_CHANNEL_OPTIONS", channel->name); + reply("CSMSG_BAR"); for(ii = 0; ii < set_shows_list.used; ii++) { subcmd = set_shows_list.list[ii]; subcmd->command->func(user, channel, 1, argv+1, subcmd); } + reply("CSMSG_CHANNEL_OPTIONS_END"); return 1; } @@ -5590,8 +5668,15 @@ static CHANSERV_FUNC(cmd_giveownership) new_owner = GetChannelAccess(cData, new_owner_hi); if(!new_owner) { - reply("CSMSG_NO_CHAN_USER", new_owner_hi->handle, channel->name); - return 0; + if(force) + { + new_owner = add_channel_user(cData, new_owner_hi, UL_COOWNER, 0, NULL); + } + else + { + reply("CSMSG_NO_CHAN_USER", new_owner_hi->handle, channel->name); + return 0; + } } if((chanserv_get_owned_count(new_owner_hi) >= chanserv_conf.max_owned) && !force) { @@ -5602,7 +5687,7 @@ static CHANSERV_FUNC(cmd_giveownership) if(!IsHelping(user)) reply("CSMSG_DNR_ACCOUNT", new_owner_hi->handle); else - chanserv_show_dnrs(user, cmd, NULL, new_owner_hi); + chanserv_show_dnrs(user, cmd, NULL, new_owner_hi->handle); return 0; } if(new_owner->access >= UL_COOWNER) @@ -6172,7 +6257,8 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) struct banData *ban; if((user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE)) - || !channel->channel_info) + || !channel->channel_info + || IsSuspended(channel->channel_info)) continue; for(jj = 0; jj < channel->banlist.used; ++jj) if(user_matches_glob(user, channel->banlist.list[jj]->ban, 1)) @@ -6356,7 +6442,7 @@ handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_ch if(!bounce) bounce = mod_chanmode_alloc(change->argc + 1 - ii); bounce->args[bnc].mode = MODE_REMOVE | MODE_BAN; - bounce->args[bnc].u.hostmask = ban; + bounce->args[bnc].u.hostmask = strdup(ban); bnc++; send_message(user, chanserv, "CSMSG_MASK_PROTECTED", ban); } @@ -6365,6 +6451,9 @@ handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_ch { if((bounce->argc = bnc) || bounce->modes_set || bounce->modes_clear) mod_chanmode_announce(chanserv, channel, bounce); + for(ii = 0; ii < change->argc; ++ii) + if(bounce->args[ii].mode == (MODE_REMOVE | MODE_BAN)) + free((char*)bounce->args[ii].u.hostmask); mod_chanmode_free(bounce); } } @@ -6505,7 +6594,7 @@ chanserv_conf_read(void) str = database_get_data(conf_node, KEY_INFO_DELAY, RECDB_QSTRING); chanserv_conf.info_delay = str ? ParseInterval(str) : 180; str = database_get_data(conf_node, KEY_MAX_GREETLEN, RECDB_QSTRING); - chanserv_conf.greeting_length = str ? atoi(str) : 120; + chanserv_conf.greeting_length = str ? atoi(str) : 200; str = database_get_data(conf_node, KEY_ADJUST_THRESHOLD, RECDB_QSTRING); chanserv_conf.adjust_threshold = str ? atoi(str) : 15; str = database_get_data(conf_node, KEY_ADJUST_DELAY, RECDB_QSTRING); @@ -6602,12 +6691,8 @@ chanserv_conf_read(void) else strlist = alloc_string_list(2); chanserv_conf.old_ban_names = strlist; - /* the variable itself is actually declared in proto-common.c; this is equally - * parse issue. */ str = database_get_data(conf_node, "off_channel", RECDB_QSTRING); - off_channel = (str && enabled_string(str)) ? 1 : 0; - str = database_get_data(conf_node, "use_registered_mode", RECDB_QSTRING); - chanserv_conf.use_registered_mode = (str && enabled_string(str)) ? 1 : 0; + off_channel = str ? atoi(str) : 0; } static void @@ -6722,6 +6807,8 @@ ban_read_helper(const char *key, struct record_data *rd, struct chanData *chan) s_expires = database_get_data(rd->d.object, KEY_EXPIRES, RECDB_QSTRING); owner = database_get_data(rd->d.object, KEY_OWNER, RECDB_QSTRING); reason = database_get_data(rd->d.object, KEY_REASON, RECDB_QSTRING); + if (!reason || !owner) + return; set_time = set ? (time_t)strtoul(set, NULL, 0) : now; triggered_time = triggered ? (time_t)strtoul(triggered, NULL, 0) : 0; @@ -6732,7 +6819,7 @@ ban_read_helper(const char *key, struct record_data *rd, struct chanData *chan) else expires_time = 0; - if(expires_time && (expires_time < now)) + if(!reason || (expires_time && (expires_time < now))) return; bData = add_channel_ban(chan, key, owner, set_time, triggered_time, expires_time, reason); @@ -6918,7 +7005,7 @@ chanserv_channel_read(const char *key, struct record_data *hir) && (argc = split_line(str, 0, ArrayLength(argv), argv)) && (modes = mod_chanmode_parse(cNode, argv, argc, MCP_KEY_FREE))) { cData->modes = *modes; - if(chanserv_conf.use_registered_mode) + if(off_channel > 0) cData->modes.modes_set |= MODE_REGISTERED; if(cData->modes.argc > 1) cData->modes.argc = 1; @@ -7409,7 +7496,7 @@ init_chanserv(const char *nick) DEFINE_CHANNEL_OPTION(ctcpusers); DEFINE_CHANNEL_OPTION(ctcpreaction); DEFINE_CHANNEL_OPTION(inviteme); - if(off_channel) + if(off_channel > 1) DEFINE_CHANNEL_OPTION(offchannel); modcmd_register(chanserv_module, "set defaults", chan_opt_defaults, 1, 0, "access", "owner", NULL); @@ -7444,7 +7531,7 @@ init_chanserv(const char *nick) next_refresh = (now + chanserv_conf.refresh_period - 1) / chanserv_conf.refresh_period * chanserv_conf.refresh_period; timeq_add(next_refresh, chanserv_refresh_topics, NULL); } - + reg_exit_func(chanserv_db_cleanup); message_register_table(msgtab); }