X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/fc8798ec4682f65c6aa3775327c896864df1ec00..30f7b947f03d97a3d526bbadb50b9dd71aba4117:/src/chanserv.c diff --git a/src/chanserv.c b/src/chanserv.c index 02e10c3..e61cb35 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -56,9 +56,13 @@ #define KEY_GIVEOWNERSHIP_PERIOD "giveownership_timeout" /* ChanServ database */ +#define KEY_VERSION_CONTROL "version_control" #define KEY_CHANNELS "channels" #define KEY_NOTE_TYPES "note_types" +/* version control paramiter */ +#define KEY_VERSION_NUMBER "version_number" + /* Note type parameters */ #define KEY_NOTE_OPSERV_ACCESS "opserv_access" #define KEY_NOTE_CHANNEL_ACCESS "channel_access" @@ -131,9 +135,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 +188,18 @@ 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_ADDUSER_PENDING", "I have sent him/her a message letting them know, and if they auth or register soon, i will finish adding them automatically." }, + { "CSMSG_ADDUSER_PENDING_ALREADY", "He or she is already pending addition to %s once he/she auths with $b$N$b." }, + { "CSMSG_ADDUSER_PENDING_LIST", "Channel %s user %s" }, /* Remove after testing */ + /*{ "CSMSG_ADDUSER_PENDING_NOTINCHAN", "That user is not in %s, and is not auth'd." }, */ + { "CSMSG_ADDUSER_PENDING_TARGET", "Channel Services bot here, %s would like to add you to my userlist in channel %s, but you are not auth'd to $b$N$b. Please auth now, and you will be added. If you do not have an accont, type /msg $N help register" }, { "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 +237,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." }, @@ -242,9 +251,11 @@ static const struct message_entry msgtab[] = { { "CSMSG_CONFIRM_DEFAULTS", "To reset %s's settings to the defaults, you must use 'set defaults %s'." }, { "CSMSG_SETTINGS_DEFAULTED", "All settings for %s have been reset to default values." }, { "CSMSG_BAD_SETLEVEL", "You cannot change any setting to above your level." }, + /* { "CSMSG_BAD_GIVEVOICE", "You cannot change GiveVoice to above GiveHalfOps (%d)." }, { "CSMSG_BAD_GIVEHOPS", "You cannot change GiveHalfOps to below GiveOps (%d)." }, { "CSMSG_BAD_GIVEOPS", "You cannot change GiveOps to below GiveVoice (%d)." }, + */ { "CSMSG_BAD_SETTERS", "You cannot change Setters to above your level." }, { "CSMSG_INVALID_MODE_LOCK", "$b%s$b is an invalid mode lock." }, { "CSMSG_INVALID_NUMERIC", "$b%d$b is not a valid choice. Choose one:" }, @@ -257,24 +268,29 @@ static const struct message_entry msgtab[] = { { "CSMSG_SET_DYNLIMIT", "$bDynLimit $b %s" }, { "CSMSG_SET_OFFCHANNEL", "$bOffChannel $b %s" }, { "CSMSG_SET_USERINFO", "$bUserInfo $b %d" }, + /* { "CSMSG_SET_GIVE_VOICE", "$bGiveVoice $b %d" }, { "CSMSG_SET_GIVE_HALFOPS", "$bGiveHalfOps $b %d" }, + */ { "CSMSG_SET_TOPICSNARF", "$bTopicSnarf $b %d" }, { "CSMSG_SET_INVITEME", "$bInviteMe $b %d" }, { "CSMSG_SET_ENFOPS", "$bEnfOps $b %d" }, { "CSMSG_SET_ENFHALFOPS", "$bEnfHalfOps $b %d" }, + /* { "CSMSG_SET_GIVE_OPS", "$bGiveOps $b %d" }, + */ { "CSMSG_SET_ENFMODES", "$bEnfModes $b %d" }, { "CSMSG_SET_ENFTOPIC", "$bEnfTopic $b %d" }, { "CSMSG_SET_PUBCMD", "$bPubCmd $b %d" }, { "CSMSG_SET_SETTERS", "$bSetters $b %d" }, { "CSMSG_SET_CTCPUSERS", "$bCTCPUsers $b %d" }, + { "CSMSG_SET_VOICE", "$bvoice $b %d - %s" }, { "CSMSG_SET_PROTECT", "$bProtect $b %d - %s" }, { "CSMSG_SET_TOYS", "$bToys $b %d - %s" }, { "CSMSG_SET_CTCPREACTION", "$bCTCPReaction$b %d - %s" }, { "CSMSG_SET_TOPICREFRESH", "$bTopicRefresh$b %d - %s" }, - { "CSMSG_USET_NOAUTOOP", "$bNoAutoOp $b %s" }, - { "CSMSG_USET_NOAUTOVOICE", "$bNoAutoVoice $b %s" }, + { "CSMSG_USET_AUTOOP", "$bAutoOp $b %s" }, + { "CSMSG_USET_AUTOVOICE", "$bAutoVoice $b %s" }, { "CSMSG_USET_AUTOINVITE", "$bAutoInvite $b %s" }, { "CSMSG_USET_INFO", "$bInfo $b %s" }, @@ -288,6 +304,9 @@ static const struct message_entry msgtab[] = { { "CSMSG_DEHALFOPPED_USERS", "DeHalfopped users in $b%s$b." }, { "CSMSG_VOICED_USERS", "Voiced users in $b%s$b." }, { "CSMSG_DEVOICED_USERS", "Devoiced users in $b%s$b." }, + { "CSMSG_VOICE_NONE", "Noone will be auto-voiced" }, + { "CSMSG_VOICE_PEON", "PEONs will be auto-voiced" }, + { "CSMSG_VOICE_ALL", "Everyone will be auto-voiced" }, { "CSMSG_PROTECT_ALL", "Non-users and users will be protected from those of equal or lower access." }, { "CSMSG_PROTECT_EQUAL", "Users will be protected from those of equal or lower access." }, { "CSMSG_PROTECT_LOWER", "Users will be protected from those of lower access." }, @@ -319,10 +338,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 +376,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 +394,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 +416,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 +446,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 +471,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 +491,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_breef(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(); \ @@ -483,6 +507,8 @@ dict_t note_types; int off_channel; static dict_t plain_dnrs, mask_dnrs, handle_dnrs; static struct log_type *CS_LOG; +struct adduserPending* adduser_pendings = NULL; +unsigned int adduser_pendings_count = 0; static struct { @@ -575,7 +601,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, '@' }, @@ -611,7 +637,11 @@ static const struct { struct charOptionValues { char value; char *format_name; -} protectValues[] = { +} voiceValues[] = { + { 'n', "CSMSG_VOICE_NONE" }, + { 'p', "CSMSG_VOICE_PEON" }, + { 'a', "CSMSG_VOICE_ALL" } +}, protectValues[] = { { 'a', "CSMSG_PROTECT_ALL" }, { 'e', "CSMSG_PROTECT_EQUAL" }, { 'l', "CSMSG_PROTECT_LOWER" }, @@ -641,8 +671,9 @@ static const struct { unsigned char count; struct charOptionValues *values; } charOptions[] = { - { "CSMSG_SET_PROTECT", "protect", 'l', 0, ArrayLength(protectValues), protectValues }, - { "CSMSG_SET_TOYS", "toys", 'p', 6, ArrayLength(toysValues), toysValues }, + { "CSMSG_SET_VOICE", "voice", 'p', 99, ArrayLength(voiceValues), voiceValues }, + { "CSMSG_SET_PROTECT", "protect", 'l', 0, ArrayLength(protectValues), protectValues }, + { "CSMSG_SET_TOYS", "toys", 'p', 6, ArrayLength(toysValues), toysValues }, { "CSMSG_SET_TOPICREFRESH", "topicrefresh", 'n', 8, ArrayLength(topicRefreshValues), topicRefreshValues }, { "CSMSG_SET_CTCPREACTION", "ctcpreaction", 't', 10, ArrayLength(ctcpReactionValues), ctcpReactionValues } }; @@ -651,6 +682,9 @@ struct userData *helperList; struct chanData *channelList; static struct module *chanserv_module; static unsigned int userCount; +unsigned int chanserv_read_version = 0; /* db version control */ + +#define CHANSERV_DB_VERSION 2 #define GetChannelUser(channel, handle) _GetChannelUser(channel, handle, 1, 0) #define GetChannelAccess(channel, handle) _GetChannelUser(channel, handle, 0, 0) @@ -670,6 +704,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) { @@ -1142,6 +1192,7 @@ add_channel_user(struct chanData *channel, struct handle_info *handle, unsigned ud->u_next->u_prev = ud; ud->handle->channels = ud; + ud->flags = USER_FLAGS_DEFAULT; return ud; } @@ -1175,6 +1226,110 @@ del_channel_user(struct userData *user, int do_gc) unregister_channel(channel, "lost all users."); } +static struct adduserPending* +add_adduser_pending(struct chanNode *channel, struct userNode *user, int level) +{ + struct adduserPending *ap; + ap = calloc(1,sizeof(struct adduserPending)); + ap->channel = channel; + ap->user = user; + ap->level = level; + ap->created = time(NULL); + + /* ap->prev defaults to NULL already.. */ + ap->next = adduser_pendings; + if(adduser_pendings) + adduser_pendings->prev = ap; + adduser_pendings = ap; + adduser_pendings_count++; + return(ap); +} + +static void +del_adduser_pending(struct adduserPending *ap) +{ + if(ap->prev) + ap->prev->next = ap->next; + else + adduser_pendings = ap->next; + + if(ap->next) + ap->next->prev = ap->prev; + free(ap); +} + +static void expire_adduser_pending(); + +/* find_adduser_pending(channel, user) will find an arbitrary record + * from user, channel, or user and channel. + * if user or channel are NULL, they will match any records. + */ +static struct adduserPending* +find_adduser_pending(struct chanNode *channel, struct userNode *user) +{ + struct adduserPending *ap; + + expire_adduser_pending(); /* why not here.. */ + + if(!channel && !user) /* 2 nulls matches all */ + return(adduser_pendings); + for(ap = adduser_pendings;ap;ap = ap->next) + { + if((channel == ap->channel && (user == NULL || user == ap->user)) || (user==ap->user && channel==NULL)) + return ap; + } + return NULL; +} + + +/* Remove all pendings for a user or channel + * + * called in nickserv.c DelUser() and proto-* unregister_channel() + */ +void +wipe_adduser_pending(struct chanNode *channel, struct userNode *user) +{ + struct adduserPending *ap; + + /* So this is a bit wastefull, i hate dealing with linked lists. + * if its a problem we'll rewrite it right */ + while((ap = find_adduser_pending(channel, user))) { + del_adduser_pending(ap); + } +} + +/* Called from nickserv.c cmd_auth after someone auths */ +void +process_adduser_pending(struct userNode *user) +{ + struct adduserPending *ap; + while((ap = find_adduser_pending(NULL, user))) + { + struct userData *actee; + actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL); + scan_user_presence(actee, NULL); + del_adduser_pending(ap); + } +} + +static void +expire_adduser_pending() +{ + struct adduserPending *ap, *ap_next; + ap = adduser_pendings; + while(ap) + { + if((ap->created + ADDUSER_PENDING_EXPIRE) < time(NULL)) + { /* expire it */ + ap_next = ap->next; /* save next */ + del_adduser_pending(ap); /* free and relink */ + ap = ap_next; /* advance */ + } + else + ap = ap->next; + } +} + static void expire_ban(void *data); static struct banData* @@ -1292,6 +1447,7 @@ unregister_channel(struct chanData *channel, const char *reason) - Channel users. - Channel bans. - Channel suspension data. + - adduser_pending data. - Timeq entries. (Except timed bans, which are handled elsewhere.) */ @@ -1307,6 +1463,8 @@ unregister_channel(struct chanData *channel, const char *reason) mod_chanmode_announce(chanserv, channel->channel, &change); } + wipe_adduser_pending(channel->channel, NULL); + while(channel->users) del_channel_user(channel->users, 0); @@ -1400,7 +1558,7 @@ protect_user(const struct userNode *victim, const struct userNode *aggressor, st /* Don't protect if no one is to be protected, someone is attacking himself, or if the aggressor is an IRC Operator. */ - if(protect == 'n' || victim == aggressor || IsOper(aggressor)) + if(protect == 'n' || victim == aggressor /* Opers dont get special treatment :/ || IsOper(aggressor) */) return 0; /* Don't protect if the victim isn't authenticated (because they @@ -1443,7 +1601,7 @@ validate_op(struct userNode *user, struct chanNode *channel, struct userNode *vi struct userData *cs_victim; if((!(cs_victim = GetChannelUser(cData, victim->handle_info)) - || (cs_victim->access < cData->lvlOpts[lvlGiveOps])) + || (cs_victim->access < UL_OP /* cData->lvlOpts[lvlGiveOps]*/)) && !check_user_level(channel, user, lvlEnfOps, 0, 0)) { send_message(user, chanserv, "CSMSG_OPBY_LOCKED"); @@ -1460,7 +1618,7 @@ validate_halfop(struct userNode *user, struct chanNode *channel, struct userNode struct userData *cs_victim; if((!(cs_victim = GetChannelUser(cData, victim->handle_info)) - || (cs_victim->access < cData->lvlOpts[lvlGiveHalfOps])) + || (cs_victim->access < UL_HALFOP /* cData->lvlOpts[lvlGiveHalfOps] */)) && !check_user_level(channel, user, lvlEnfHalfOps, 0, 0)) { send_message(user, chanserv, "CSMSG_HOPBY_LOCKED"); @@ -1600,6 +1758,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)) { @@ -1658,6 +1817,7 @@ static CHANSERV_FUNC(cmd_noregister) } reply("CSMSG_DNR_SEARCH_RESULTS"); + reply("CSMSG_BAR"); if(*target == '*') matches = chanserv_show_dnrs(user, cmd, NULL, target + 1); else @@ -1745,7 +1905,7 @@ static CHANSERV_FUNC(cmd_register) if(argc < 2) { reply("MSG_MISSING_PARAMS", cmd->name); - svccmd_send_help_breef(user, chanserv, cmd); + svccmd_send_help_brief(user, chanserv, cmd); return 0; } if(!IsChannelName(argv[1])) @@ -2275,17 +2435,40 @@ static CHANSERV_FUNC(cmd_adduser) } if(!(handle = modcmd_get_handle_info(user, argv[1]))) + { + // 'kevin must first authenticate with AuthServ.' is sent to user + struct userNode *unode; + unode = GetUserH(argv[1]); /* find user struct by nick */ + if(unode) + { + if(find_adduser_pending(channel, unode)) { + reply("CSMSG_ADDUSER_PENDING_ALREADY", channel->name); + } + else { + if(IsInChannel(channel, unode)) { + reply("CSMSG_ADDUSER_PENDING"); + add_adduser_pending(channel, unode, access); + send_message_type(1,unode, chanserv, "CSMSG_ADDUSER_PENDING_TARGET", user->nick, channel->name); + } + /* this results in user must auth AND not in chan errors. too confusing.. + else { + reply("CSMSG_ADDUSER_PENDING_NOTINCHAN", channel->name); + } + */ + } + } return 0; + } 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; } @@ -2337,7 +2520,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; } @@ -2372,7 +2555,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; } } @@ -2597,17 +2780,17 @@ static CHANSERV_FUNC(cmd_up) reply("CSMSG_GODMODE_UP", argv[0]); return 0; } - else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveOps]) + else if(uData->access >= UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/) { change.args[0].mode = MODE_CHANOP; errmsg = "CSMSG_ALREADY_OPPED"; } - else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveHalfOps]) + else if(uData->access >= UL_HALFOP /*channel->channel_info->lvlOpts[lvlGiveHalfOps]*/) { change.args[0].mode = MODE_HALFOP; errmsg = "CSMSG_ALREADY_HALFOPPED"; } - else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveVoice]) + else if(uData->access >= UL_PEON && (channel->channel_info->chOpts[chVoice] == 'p' || channel->channel_info->chOpts[chVoice] == 'a')) { change.args[0].mode = MODE_VOICE; errmsg = "CSMSG_ALREADY_VOICED"; @@ -3169,9 +3352,9 @@ unban_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c { unsigned int ii; + modcmd_chanmode_announce(change); for(ii = 0; ii < change->argc; ++ii) free((char*)change->args[ii].u.hostmask); - modcmd_chanmode_announce(change); mod_chanmode_free(change); acted = 1; } @@ -3313,17 +3496,17 @@ static CHANSERV_FUNC(cmd_myaccess) continue; sbuf.used = 0; string_buffer_append_printf(&sbuf, "[%s (%d", cData->channel->name, uData->access); - if(uData->flags != USER_AUTO_OP) + if(uData->flags == USER_AUTO_OP) string_buffer_append(&sbuf, ','); if(IsUserSuspended(uData)) string_buffer_append(&sbuf, 's'); if(IsUserAutoOp(uData)) { - if(uData->access >= cData->lvlOpts[lvlGiveOps]) + if(uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/) string_buffer_append(&sbuf, 'o'); - else if(uData->access >= cData->lvlOpts[lvlGiveHalfOps]) + else if(uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/) string_buffer_append(&sbuf, 'h'); - else if(uData->access >= cData->lvlOpts[lvlGiveVoice]) + else if(uData->access >= UL_PEON /*cData->lvlOpts[lvlGiveVoice]*/) string_buffer_append(&sbuf, 'v'); } if(IsUserAutoInvite(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe])) @@ -3436,7 +3619,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. */ @@ -3461,6 +3644,7 @@ static CHANSERV_FUNC(cmd_access) return 1; } +/* This is never used... */ static void zoot_list(struct listData *list) { @@ -3472,9 +3656,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); } @@ -3495,9 +3679,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; @@ -3516,9 +3700,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) { @@ -3556,8 +3740,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) @@ -3566,6 +3752,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; @@ -3580,15 +3767,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]; @@ -3596,26 +3784,28 @@ 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); + 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]); @@ -3623,6 +3813,14 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg return 1; } +static CHANSERV_FUNC(cmd_pending) +{ + struct adduserPending *ap; + for(ap = adduser_pendings;ap;ap = ap->next) + reply("CSMSG_ADDUSER_PENDING_LIST", ap->channel->name, ap->user->nick); + return 1; +} + static CHANSERV_FUNC(cmd_users) { return cmd_list_users(CSFUNC_ARGS, 1, UL_OWNER); @@ -3671,6 +3869,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) @@ -3737,7 +3936,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]); @@ -3750,20 +3949,71 @@ static CHANSERV_FUNC(cmd_bans) return 1; } +/* bad_topic + * + * return + if the user does NOT have the right to set the topic, and + * the topic is changed. + */ static int bad_topic(struct chanNode *channel, struct userNode *user, const char *new_topic) { struct chanData *cData = channel->channel_info; if(check_user_level(channel, user, lvlEnfTopic, 1, 0)) return 0; - if(cData->topic_mask) - return !match_ircglob(new_topic, cData->topic_mask); else if(cData->topic) return irccasecmp(new_topic, cData->topic); else return 0; } +/* conform_topic + * + * Makes a givin topic fit into a givin topic mask and returns + * the results. + * + * topic_mask - the mask to conform to + * topic - the topic to make conform + * new_topic - the pre-allocated char* to put the new topic into + * + * modifies: new_topic + */ +void +conform_topic(char* topic_mask, char* topic, char *new_topic) +{ + //char *topic_mask = cData->topic_mask; + char tchar; + int pos=0, starpos=-1, dpos=0, len; + + while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN)) + { + switch(tchar) + { + case '*': + if(starpos != -1) + { + strcpy(new_topic, ""); + return; + } + len = strlen(topic); + if((dpos + len) > TOPICLEN) + len = TOPICLEN + 1 - dpos; + memcpy(new_topic+dpos, topic, len); + dpos += len; + starpos = pos; + break; + case '\\': tchar = topic_mask[pos++]; /* and fall through */ + default: new_topic[dpos++] = tchar; break; + } + } + if((dpos > TOPICLEN) || tchar) + { + strcpy(new_topic, ""); + return; + } + new_topic[dpos] = 0; + return; +} + static CHANSERV_FUNC(cmd_topic) { struct chanData *cData; @@ -3772,12 +4022,12 @@ static CHANSERV_FUNC(cmd_topic) cData = channel->channel_info; if(argc < 2) { - if(cData->topic) - { - SetChannelTopic(channel, chanserv, cData->topic, 1); - reply("CSMSG_TOPIC_SET", cData->topic); + if(cData->topic) + { + SetChannelTopic(channel, chanserv, cData->topic, 1); + reply("CSMSG_TOPIC_SET", cData->topic); return 1; - } + } reply("CSMSG_NO_TOPIC", channel->name); return 0; @@ -3787,48 +4037,34 @@ static CHANSERV_FUNC(cmd_topic) /* If they say "!topic *", use an empty topic. */ if((topic[0] == '*') && (topic[1] == 0)) topic[0] = 0; + if(bad_topic(channel, user, topic)) { - char *topic_mask = cData->topic_mask; - if(topic_mask) + reply("CSMSG_TOPIC_LOCKED", channel->name); + return 0; + } + else + { + /* If there is a topicmask set, and the new topic doesnt match, make it */ + if(cData->topic_mask && !match_ircglob(topic, cData->topic_mask)) { - char new_topic[TOPICLEN+1], tchar; - int pos=0, starpos=-1, dpos=0, len; + char *topic_mask = cData->topic_mask; + char new_topic[TOPICLEN+1]; - while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN)) + /* make a new topic fitting mask */ + conform_topic(topic_mask, topic, new_topic); + if(!*new_topic) { - switch(tchar) - { - case '*': - if(starpos != -1) - goto bad_mask; - len = strlen(topic); - if((dpos + len) > TOPICLEN) - len = TOPICLEN + 1 - dpos; - memcpy(new_topic+dpos, topic, len); - dpos += len; - starpos = pos; - break; - case '\\': tchar = topic_mask[pos++]; /* and fall through */ - default: new_topic[dpos++] = tchar; break; - } - } - if((dpos > TOPICLEN) || tchar) - { - bad_mask: + /* Topic couldnt fit into mask, was too long */ reply("CSMSG_TOPICMASK_CONFLICT1", channel->name, topic_mask); reply("CSMSG_TOPICMASK_CONFLICT2", TOPICLEN); return 0; } - new_topic[dpos] = 0; SetChannelTopic(channel, chanserv, new_topic, 1); - } else { - reply("CSMSG_TOPIC_LOCKED", channel->name); - return 0; } + else /* No mask set, just set the topic */ + SetChannelTopic(channel, chanserv, topic, 1); } - else - SetChannelTopic(channel, chanserv, topic, 1); if(check_user_level(channel, user, lvlTopicSnarf, 1, 0)) { @@ -4002,9 +4238,10 @@ 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])) + if(uData && (uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/)) { mod_chanmode_format(&cData->modes, modes); reply("CSMSG_CHANNEL_TOPIC", cData->topic); @@ -4051,6 +4288,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; } @@ -4137,6 +4375,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); @@ -4161,6 +4400,7 @@ static CHANSERV_FUNC(cmd_peek) } else reply("CSMSG_PEEK_NO_OPS"); + reply("CSMSG_PEEK_END"); return 1; } @@ -4206,8 +4446,7 @@ static CHANSERV_FUNC(cmd_resync) continue; uData = GetChannelAccess(cData, mn->user->handle_info); - if(!cData->lvlOpts[lvlGiveOps] - || (uData && uData->access >= cData->lvlOpts[lvlGiveOps])) + if(uData && uData->access >= UL_OP /* cData->lvlOpts[lvlGiveOps]*/) { if(!(mn->modes & MODE_CHANOP)) { @@ -4215,8 +4454,7 @@ static CHANSERV_FUNC(cmd_resync) changes->args[used++].u.member = mn; } } - else if(!cData->lvlOpts[lvlGiveHalfOps] - || (uData && uData->access >= cData->lvlOpts[lvlGiveHalfOps])) + else if(uData && uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/) { if(!(mn->modes & MODE_HALFOP)) { @@ -4234,8 +4472,7 @@ static CHANSERV_FUNC(cmd_resync) changes->args[used++].u.member = mn; } } - else if(!cData->lvlOpts[lvlGiveVoice] - || (uData && uData->access >= cData->lvlOpts[lvlGiveVoice])) + else if(uData && uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice]*/) { if(mn->modes & MODE_CHANOP) { @@ -4493,7 +4730,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); @@ -4828,7 +5066,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); @@ -5191,6 +5432,7 @@ channel_level_option(enum levelOption option, struct userNode *user, struct chan } switch(option) { + /* removing these level sets.. case lvlGiveVoice: if(value > cData->lvlOpts[lvlGiveOps]) { @@ -5212,6 +5454,7 @@ channel_level_option(enum levelOption option, struct userNode *user, struct chan return 0; } break; + */ case lvlSetters: /* This test only applies to owners, since non-owners * trying to set an option to above their level get caught @@ -5241,7 +5484,7 @@ static MODCMD_FUNC(chan_opt_enfhalfops) { return channel_level_option(lvlEnfHalfOps, CSFUNC_ARGS); } - +/* static MODCMD_FUNC(chan_opt_giveops) { return channel_level_option(lvlGiveOps, CSFUNC_ARGS); @@ -5251,7 +5494,7 @@ static MODCMD_FUNC(chan_opt_givehalfops) { return channel_level_option(lvlGiveHalfOps, CSFUNC_ARGS); } - +*/ static MODCMD_FUNC(chan_opt_enfmodes) { return channel_level_option(lvlEnfModes, CSFUNC_ARGS); @@ -5282,10 +5525,12 @@ static MODCMD_FUNC(chan_opt_userinfo) return channel_level_option(lvlUserInfo, CSFUNC_ARGS); } +/* static MODCMD_FUNC(chan_opt_givevoice) { return channel_level_option(lvlGiveVoice, CSFUNC_ARGS); } +*/ static MODCMD_FUNC(chan_opt_topicsnarf) { @@ -5337,6 +5582,11 @@ channel_multiple_option(enum charOption option, struct userNode *user, struct ch return 1; } +static MODCMD_FUNC(chan_opt_voice) +{ + return channel_multiple_option(chVoice, CSFUNC_ARGS); +} + static MODCMD_FUNC(chan_opt_protect) { return channel_multiple_option(chProtect, CSFUNC_ARGS); @@ -5397,12 +5647,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; } @@ -5456,7 +5708,7 @@ user_binary_option(char *name, unsigned long mask, struct userNode *user, struct return 1; } -static MODCMD_FUNC(user_opt_noautoop) +static MODCMD_FUNC(user_opt_autoop) { struct userData *uData; @@ -5466,10 +5718,11 @@ static MODCMD_FUNC(user_opt_noautoop) reply("CSMSG_NOT_USER", channel->name); return 0; } - if(uData->access < channel->channel_info->lvlOpts[lvlGiveOps]) - return user_binary_option("CSMSG_USET_NOAUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS); + if(uData->access < UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/) + return user_binary_option("CSMSG_USET_AUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS); else - return user_binary_option("CSMSG_USET_NOAUTOOP", USER_AUTO_OP, CSFUNC_ARGS); + return user_binary_option("CSMSG_USET_AUTOOP", USER_AUTO_OP, CSFUNC_ARGS); + /* TODO: add halfops error message? or is the op one generic enough? */ } static MODCMD_FUNC(user_opt_autoinvite) @@ -5535,7 +5788,7 @@ static CHANSERV_FUNC(cmd_uset) { char *options[] = { - "NoAutoOp", "AutoInvite", "Info" + "AutoOp", "AutoInvite", "Info" }; if(!uset_shows_list.size) @@ -6080,13 +6333,10 @@ handle_join(struct modeNode *mNode) if(channel->join_flooded) { - /* don't automatically give ops or voice during a join flood */ + /* don't automatically give non users ops or voice during a join flood */ } - else if(cData->lvlOpts[lvlGiveOps] == 0) - modes |= MODE_CHANOP; - else if(cData->lvlOpts[lvlGiveHalfOps] == 0) - modes |= MODE_HALFOP; - else if(cData->lvlOpts[lvlGiveVoice] == 0) + /* EVERYONE is to get voice */ + else if(cData->chOpts[chVoice] == 'a') modes |= MODE_VOICE; greeting = cData->greeting; @@ -6110,14 +6360,14 @@ handle_join(struct modeNode *mNode) uData = GetTrueChannelAccess(cData, handle); if(uData && !IsUserSuspended(uData)) { - /* Ops and above were handled by the above case. */ + /* non users getting voice are handled above. */ if(IsUserAutoOp(uData)) { - if(uData->access >= cData->lvlOpts[lvlGiveOps]) + if(uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/) modes |= MODE_CHANOP; - if(uData->access >= cData->lvlOpts[lvlGiveHalfOps]) + if(uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/) modes |= MODE_HALFOP; - else if(uData->access >= cData->lvlOpts[lvlGiveVoice]) + else if(uData->access >= UL_PEON && cData->chOpts[chVoice] == 'p') modes |= MODE_VOICE; } if(uData->access >= UL_PRESENT) @@ -6191,11 +6441,11 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle)) if(IsUserAutoOp(channel)) { - if(channel->access >= cn->channel_info->lvlOpts[lvlGiveOps]) + if(channel->access >= UL_OP /* cn->channel_info->lvlOpts[lvlGiveOps] */) change.args[0].mode = MODE_CHANOP; - else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveHalfOps]) + else if(channel->access >= UL_HALFOP /* cn->channel_info->lvlOpts[lvlGiveHalfOps]*/) change.args[0].mode = MODE_HALFOP; - else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveVoice]) + else if(channel->access >= UL_PEON /* cn->channel_info->lvlOpts[lvlGiveVoice]*/) change.args[0].mode = MODE_VOICE; else change.args[0].mode = 0; @@ -6323,14 +6573,30 @@ handle_topic(struct userNode *user, struct chanNode *channel, const char *old_to cData = channel->channel_info; if(bad_topic(channel, user, channel->topic)) - { + { /* User doesnt have privs to set topics. Undo it */ send_message(user, chanserv, "CSMSG_TOPIC_LOCKED", channel->name); - if(cData->topic_mask && match_ircglob(old_topic, cData->topic_mask)) - SetChannelTopic(channel, chanserv, old_topic, 1); - else if(cData->topic) - SetChannelTopic(channel, chanserv, cData->topic, 1); + SetChannelTopic(channel, chanserv, old_topic, 1); return 1; } + /* If there is a topic mask set, and the new topic doesnt match, + * set the topic to mask + new_topic */ + if(cData->topic_mask && !match_ircglob(channel->topic, cData->topic_mask)) + { + char new_topic[TOPICLEN+1]; + conform_topic(cData->topic_mask, channel->topic, new_topic); + if(*new_topic) + { + SetChannelTopic(channel, chanserv, new_topic, 1); + /* and fall through to topicsnarf code below.. */ + } + else /* Topic couldnt fit into mask, was too long */ + { + SetChannelTopic(channel, chanserv, old_topic, 1); + send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT1", channel->name, cData->topic_mask); + send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT2", TOPICLEN); + return 1; + } + } /* With topicsnarf, grab the topic and save it as the default topic. */ if(check_user_level(channel, user, lvlTopicSnarf, 0, 0)) { @@ -6607,7 +6873,7 @@ chanserv_conf_read(void) /* free form text */ "DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes", /* options based on user level */ - "PubCmd", "InviteMe", "UserInfo", "GiveVoice", "GiveHalfOps", "GiveOps", "EnfOps", + "PubCmd", "InviteMe", "UserInfo",/* "GiveVoice", "GiveHalfOps", "GiveOps", */ "EnfOps", "EnfHalfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters", "CtcpUsers", /* multiple choice options */ "CtcpReaction", "Protect", "Toys", "TopicRefresh", @@ -6743,6 +7009,18 @@ user_read_helper(const char *key, struct record_data *rd, struct chanData *chan) uData = add_channel_user(chan, handle, access, last_seen, inf); uData->flags = flags ? strtoul(flags, NULL, 0) : 0; + + /* Upgrade: set autoop to the inverse of noautoop */ + if(chanserv_read_version < 2) + { + /* if noautoop is true, set autoop false, and vice versa */ + if(uData->flags & USER_NOAUTO_OP) + uData->flags = uData->flags & ~USER_AUTO_OP; + else + uData->flags = uData->flags | USER_AUTO_OP; + log_module(CS_LOG, LOG_INFO, "UPGRADE: to db version 2 from %u. Changing flag to %d for %s in %s.", chanserv_read_version, uData->flags, key, chan->channel->name); + } + } static void @@ -7043,12 +7321,26 @@ chanserv_dnr_read(const char *key, struct record_data *hir) dnr->set = 0; } +static void +chanserv_version_read(struct dict *section) +{ + /* global var.. */ + char *str; + str = database_get_data(section, KEY_VERSION_NUMBER, RECDB_QSTRING); + if(str) + chanserv_read_version = atoi(str); + log_module(CS_LOG, LOG_DEBUG, "Chanserv db version is %d.", chanserv_read_version); +} + static int chanserv_saxdb_read(struct dict *database) { struct dict *section; dict_iterator_t it; + if((section = database_get_data(database, KEY_VERSION_CONTROL, RECDB_OBJECT))) + chanserv_version_read(section); + if((section = database_get_data(database, KEY_NOTE_TYPES, RECDB_OBJECT))) for(it = dict_first(section); it; it = iter_next(it)) chanserv_note_type_read(iter_key(it), iter_data(it)); @@ -7247,6 +7539,11 @@ chanserv_saxdb_write(struct saxdb_context *ctx) dict_iterator_t it; struct chanData *channel; + /* Version Control*/ + saxdb_start_record(ctx, KEY_VERSION_CONTROL, 1); + saxdb_write_int(ctx, KEY_VERSION_NUMBER, CHANSERV_DB_VERSION); + saxdb_end_record(ctx); + /* Notes */ saxdb_start_record(ctx, KEY_NOTE_TYPES, 1); for(it = dict_first(note_types); it; it = iter_next(it)) @@ -7325,6 +7622,8 @@ init_chanserv(const char *nick) dict_set_free_data(plain_dnrs, free); mask_dnrs = dict_new(); dict_set_free_data(mask_dnrs, free); + //TODO + //adduser_pending reg_svccmd_unbind_func(handle_svccmd_unbind); chanserv_module = module_register("ChanServ", CS_LOG, "chanserv.help", chanserv_expand_variable); @@ -7337,6 +7636,8 @@ init_chanserv(const char *nick) DEFINE_COMMAND(createnote, 5, 0, "level", "800", NULL); DEFINE_COMMAND(removenote, 2, 0, "level", "800", NULL); + DEFINE_COMMAND(pending, 1, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL); + DEFINE_COMMAND(unregister, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+loghostmask", NULL); DEFINE_COMMAND(merge, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", NULL); @@ -7436,13 +7737,16 @@ init_chanserv(const char *nick) DEFINE_CHANNEL_OPTION(modes); DEFINE_CHANNEL_OPTION(enfops); DEFINE_CHANNEL_OPTION(enfhalfops); - DEFINE_CHANNEL_OPTION(giveops); + /*DEFINE_CHANNEL_OPTION(giveops); DEFINE_CHANNEL_OPTION(givehalfops); + */ + DEFINE_CHANNEL_OPTION(voice); DEFINE_CHANNEL_OPTION(protect); DEFINE_CHANNEL_OPTION(enfmodes); DEFINE_CHANNEL_OPTION(enftopic); DEFINE_CHANNEL_OPTION(pubcmd); - DEFINE_CHANNEL_OPTION(givevoice); + /*DEFINE_CHANNEL_OPTION(givevoice); + */ DEFINE_CHANNEL_OPTION(userinfo); DEFINE_CHANNEL_OPTION(dynlimit); DEFINE_CHANNEL_OPTION(topicsnarf); @@ -7461,12 +7765,12 @@ init_chanserv(const char *nick) modcmd_register(chanserv_module, "set topic", chan_opt_defaulttopic, 1, 0, NULL); /* User options */ - DEFINE_USER_OPTION(noautoop); DEFINE_USER_OPTION(autoinvite); DEFINE_USER_OPTION(info); + DEFINE_USER_OPTION(autoop); /* Alias uset autovoice to uset autoop. */ - modcmd_register(chanserv_module, "uset noautovoice", user_opt_noautoop, 1, 0, NULL); + modcmd_register(chanserv_module, "uset autovoice", user_opt_autoop, 1, 0, NULL); note_types = dict_new(); dict_set_free_data(note_types, chanserv_deref_note_type); @@ -7477,6 +7781,7 @@ init_chanserv(const char *nick) service_register(chanserv)->trigger = '!'; reg_chanmsg_func('\001', chanserv, chanserv_ctcp_check); } + saxdb_register("ChanServ", chanserv_saxdb_read, chanserv_saxdb_write); if(chanserv_conf.channel_expire_frequency)