/* 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
#define KEY_MAX_CHAN_BANS "max_chan_bans"
#define KEY_NICK "nick"
#define KEY_OLD_CHANSERV_NAME "old_chanserv_name"
-#define KEY_MAX_SWITCH_LOAD "max_switch_load"
-#define KEY_SWITCH_TIMEOUT "switch_timeout"
#define KEY_8BALL_RESPONSES "8ball"
#define KEY_OLD_BAN_NAMES "old_ban_names"
#define KEY_REFRESH_PERIOD "refresh_period"
#define KEY_SUPPORT_HELPER_EPITHET "support_helper_epithet"
#define KEY_NODELETE_LEVEL "nodelete_level"
#define KEY_MAX_USERINFO_LENGTH "max_userinfo_length"
+#define KEY_GIVEOWNERSHIP_PERIOD "giveownership_timeout"
/* ChanServ database */
#define KEY_CHANNELS "channels"
#define KEY_MAX "max"
#define KEY_NOTES "notes"
#define KEY_TOPIC_MASK "topic_mask"
+#define KEY_OWNER_TRANSFER "owner_transfer"
/* User data */
#define KEY_LEVEL "level"
{ "CSMSG_ILLEGAL_CHANNEL", "$b%s$b is an illegal channel, and cannot be registered." },
{ "CSMSG_GODMODE_UP", "You may not use $b%s$b to op yourself unless you are on the user list. Use the $bop$b command instead." },
{ "CSMSG_ALREADY_OPPED", "You are already opped in $b%s$b." },
+ { "CSMSG_ALREADY_HALFOPPED", "You are already halfopped in $b%s$b." },
{ "CSMSG_ALREADY_VOICED", "You are already voiced in $b%s$b." },
- { "CSMSG_ALREADY_DOWN", "You are not opped or voiced in $b%s$b." },
+ { "CSMSG_ALREADY_DOWN", "You are not opped, halfopped, or voiced in $b%s$b." },
{ "CSMSG_ALREADY_OPCHANNED", "There has been no net.join since the last opchan in $b%s$b." },
{ "CSMSG_OPCHAN_DONE", "I have (re-)opped myself in $b%s$b." },
{ "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." },
{ "CSMSG_NO_BUMP_ACCESS", "You cannot give users access greater than or equal to your own." },
{ "CSMSG_MULTIPLE_OWNERS", "There is more than one owner in %s; please use $bCLVL$b, $bDELOWNER$b and/or $bADDOWNER$b instead." },
+ { "CSMSG_TRANSFER_WAIT", "You must wait %s before you can give ownership of $b%s$b to someone else." },
{ "CSMSG_NO_TRANSFER_SELF", "You cannot give ownership to your own account." },
{ "CSMSG_OWNERSHIP_GIVEN", "Ownership of $b%s$b has been transferred to account $b%s$b." },
{ "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." },
{ "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 GiveOps (%d)." },
+ { "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_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_USER_PROTECTED", "Sorry, $b%s$b is protected." },
{ "CSMSG_OPBY_LOCKED", "You may not op users who lack op or greater access." },
+ { "CSMSG_HOPBY_LOCKED", "You may not halfop users who lack halfop or greater access." },
{ "CSMSG_PROCESS_FAILED", "$b$C$b could not process some of the nicks you provided." },
{ "CSMSG_OPPED_USERS", "Opped users in $b%s$b." },
+ { "CSMSG_HALFOPPED_USERS", "Halfopped users in $b%s$b." },
{ "CSMSG_DEOPPED_USERS", "Deopped users in $b%s$b." },
+ { "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_PROTECT_ALL", "Non-users and users will be protected from those of equal or lower access." },
{ "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", "%s users from level %s to %s" },
+ { "CSMSG_ACCESS_SEARCH_HEADER", "%s users from level %s to %s matching %s" },
{ "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 in %s." },
/* Channel note list */
{ "CSMSG_NOTELIST_HEADER", "Notes for $b%s$b:" },
{ "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 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 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." },
#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(); \
unsigned int greeting_length;
unsigned int refresh_period;
+ unsigned int giveownership_period;
unsigned int max_owned;
unsigned int max_chan_users;
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, '@' },
{ "manager", "Manager", UL_MANAGER, '%' },
{ "coowner", "Coowner", UL_COOWNER, '*' },
unsigned short flag_value;
} levelOptions[] = {
{ "CSMSG_SET_GIVE_VOICE", "givevoice", 100, ~0, CHANNEL_VOICE_ALL, 0 },
+ { "CSMSG_SET_GIVE_HALFOPS", "givehalfops", 150, ~0, CHANNEL_HOP_ALL, 0 },
{ "CSMSG_SET_GIVE_OPS", "giveops", 200, 2, 0, 0 },
{ "CSMSG_SET_ENFOPS", "enfops", 300, 1, 0, 0 },
+ { "CSMSG_SET_ENFHALFOPS", "enfhalfops", 300, 1, 0, 0 },
{ "CSMSG_SET_ENFMODES", "enfmodes", 200, 3, 0, 0 },
{ "CSMSG_SET_ENFTOPIC", "enftopic", 200, 4, 0, 0 },
{ "CSMSG_SET_PUBCMD", "pubcmd", 0, 5, 0, 0 },
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)
{
channel->registered = now;
channel->visited = now;
channel->limitAdjusted = now;
+ channel->ownerTransfer = now;
channel->flags = CHANNEL_DEFAULT_FLAGS;
for(lvlOpt = 0; lvlOpt < NUM_LEVEL_OPTIONS; ++lvlOpt)
channel->lvlOpts[lvlOpt] = levelOptions[lvlOpt].default_value;
if(irccasecmp(mask + l1 - l2, old_name))
continue;
new_mask = alloca(MAXLEN);
- sprintf(new_mask, "%.*s%s", l1-l2, mask, hidden_host_suffix);
+ sprintf(new_mask, "%.*s%s", (int)(l1-l2), mask, hidden_host_suffix);
mask = new_mask;
}
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);
{
change.argc = 1;
change.args[0].mode = MODE_REMOVE|MODE_BAN;
- change.args[0].hostmask = bd->mask;
+ change.args[0].u.hostmask = bd->mask;
mod_chanmode_announce(chanserv, bd->channel->channel, &change);
break;
}
timeq_del(0, NULL, channel, TIMEQ_IGNORE_FUNC | TIMEQ_IGNORE_WHEN);
- mod_chanmode_init(&change);
- change.modes_clear |= MODE_REGISTERED;
- mod_chanmode_announce(chanserv, channel->channel, &change);
+ if(off_channel > 0)
+ {
+ mod_chanmode_init(&change);
+ change.modes_clear |= MODE_REGISTERED;
+ mod_chanmode_announce(chanserv, channel->channel, &change);
+ }
while(channel->users)
del_channel_user(channel->users, 0);
return 1;
}
+static int
+validate_halfop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+{
+ struct chanData *cData = channel->channel_info;
+ struct userData *cs_victim;
+
+ if((!(cs_victim = GetChannelUser(cData, victim->handle_info))
+ || (cs_victim->access < cData->lvlOpts[lvlGiveHalfOps]))
+ && !check_user_level(channel, user, lvlEnfHalfOps, 0, 0))
+ {
+ send_message(user, chanserv, "CSMSG_HOPBY_LOCKED");
+ return 0;
+ }
+
+ return 1;
+}
+
+
static int
validate_deop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
{
return 1;
}
+static int
+validate_dehop(struct userNode *user, struct chanNode *channel, struct userNode *victim)
+{
+ if(IsService(victim))
+ {
+ send_message(user, chanserv, "MSG_SERVICE_IMMUNE", victim->nick);
+ return 0;
+ }
+
+ if(protect_user(victim, user, channel->channel_info))
+ {
+ send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
+ return 0;
+ }
+
+ return 1;
+}
+
static struct do_not_register *
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);
}
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;
reply("CSMSG_DNR_SEARCH_RESULTS");
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)
static CHANSERV_FUNC(cmd_register)
{
- struct mod_chanmode *change;
struct handle_info *handle;
struct chanData *cData;
struct modeNode *mn;
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;
}
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;
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;
}
}
if(new_channel)
- channel = AddChannel(argv[1], now, NULL, NULL);
+ channel = AddChannel(argv[1], now, NULL, NULL, NULL);
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;
- change = mod_chanmode_dup(&cData->modes, 1);
- change->args[change->argc].mode = MODE_CHANOP;
- change->args[change->argc].member = AddChannelUser(chanserv, channel);
- change->argc++;
- mod_chanmode_announce(chanserv, channel, change);
- mod_chanmode_free(change);
+ if(off_channel > 0)
+ cData->modes.modes_set |= MODE_REGISTERED;
+ 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;
static CHANSERV_FUNC(cmd_move)
{
+ struct mod_chanmode change;
struct chanNode *target;
struct modeNode *mn;
struct userData *uData;
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);
+ target = AddChannel(argv[1], now, NULL, NULL, NULL);
if(!IsSuspended(channel->channel_info))
AddChannelUser(chanserv, target);
}
}
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].member = AddChannelUser(chanserv, target);
+ 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);
}
mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = GetUserMode(channel, chanserv);
+ change.args[0].u.member = GetUserMode(channel, chanserv);
mod_chanmode_announce(chanserv, channel, &change);
reply("CSMSG_OPCHAN_DONE", channel->name);
return 1;
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;
}
}
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), channel->name);
return 1;
}
}
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;
}
}
return cmd_mdel_user(user, channel, UL_PEON, UL_PEON, argv[1], cmd);
}
+static CHANSERV_FUNC(cmd_mdelhalfop)
+{
+ return cmd_mdel_user(user, channel, UL_HALFOP, UL_HALFOP, argv[1], cmd);
+}
+
+
static int
cmd_trim_bans(struct userNode *user, struct chanNode *channel, unsigned long duration)
{
if(!max_access)
{
min_access = 1;
- max_access = UL_OWNER;
+ max_access = (actor->access > UL_OWNER) ? UL_OWNER : (actor->access - 1);
}
send_message(user, chanserv, "CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info));
return 1;
mod_chanmode_init(&change);
change.argc = 1;
- change.args[0].member = GetUserMode(channel, user);
- if(!change.args[0].member)
+ change.args[0].u.member = GetUserMode(channel, user);
+ if(!change.args[0].u.member)
{
if(argc)
reply("MSG_CHANNEL_ABSENT", channel->name);
change.args[0].mode = MODE_CHANOP;
errmsg = "CSMSG_ALREADY_OPPED";
}
+ else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveHalfOps])
+ {
+ change.args[0].mode = MODE_HALFOP;
+ errmsg = "CSMSG_ALREADY_HALFOPPED";
+ }
else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveVoice])
{
change.args[0].mode = MODE_VOICE;
reply("CSMSG_NO_ACCESS");
return 0;
}
- change.args[0].mode &= ~change.args[0].member->modes;
+ change.args[0].mode &= ~change.args[0].u.member->modes;
if(!change.args[0].mode)
{
if(argc)
mod_chanmode_init(&change);
change.argc = 1;
- change.args[0].member = GetUserMode(channel, user);
- if(!change.args[0].member)
+ change.args[0].u.member = GetUserMode(channel, user);
+ if(!change.args[0].u.member)
{
if(argc)
reply("MSG_CHANNEL_ABSENT", channel->name);
return 0;
}
- if(!change.args[0].member->modes)
+ if(!change.args[0].u.member->modes)
{
if(argc)
reply("CSMSG_ALREADY_DOWN", channel->name);
return 0;
}
- change.args[0].mode = MODE_REMOVE | change.args[0].member->modes;
+ change.args[0].mode = MODE_REMOVE | change.args[0].u.member->modes;
modcmd_chanmode_announce(&change);
return 1;
}
if(!(victim = GetUserH(argv[ii])))
continue;
change->args[valid].mode = mode;
- change->args[valid].member = GetUserMode(channel, victim);
- if(!change->args[valid].member)
+ change->args[valid].u.member = GetUserMode(channel, victim);
+ if(!change->args[valid].u.member)
continue;
if(validate && !validate(user, channel, victim))
continue;
return modify_users(CSFUNC_ARGS, validate_op, MODE_CHANOP, "CSMSG_OPPED_USERS");
}
+static CHANSERV_FUNC(cmd_hop)
+{
+ return modify_users(CSFUNC_ARGS, validate_halfop, MODE_HALFOP, "CSMSG_HALFOPPED_USERS");
+}
+
static CHANSERV_FUNC(cmd_deop)
{
return modify_users(CSFUNC_ARGS, validate_deop, MODE_REMOVE|MODE_CHANOP, "CSMSG_DEOPPED_USERS");
}
+static CHANSERV_FUNC(cmd_dehop)
+{
+ return modify_users(CSFUNC_ARGS, validate_dehop, MODE_REMOVE|MODE_HALFOP, "CSMSG_DEHALFOPPED_USERS");
+}
+
static CHANSERV_FUNC(cmd_voice)
{
return modify_users(CSFUNC_ARGS, NULL, MODE_VOICE, "CSMSG_VOICED_USERS");
reply("CSMSG_MASK_PROTECTED", argv[1]);
return 0;
}
+ /* We dont actually want a victem count if were banning a mask manually, IMO -Rubin*/
+ if(cmd)
+ victimCount = 0; /* Dont deop etc ppl who match this */
+#ifdef entropy_lameness
if((victimCount > 4) && ((victimCount * 3) > channel->members.used) && !IsOper(user))
{
reply("CSMSG_LAME_MASK", argv[1]);
return 0;
}
+#endif
if((action == ACTION_KICK) && (victimCount == 0))
{
}
else if(ban)
{
+ /* WHAT DOES THIS DO?? -Rubin */
for(n = 0; n < chanserv_conf.old_ban_names->used; ++n)
{
extern const char *hidden_host_suffix;
if(irccasecmp(ban + l1 - l2, old_name))
continue;
new_mask = malloc(MAXLEN);
- sprintf(new_mask, "%.*s%s", l1-l2, ban, hidden_host_suffix);
+ sprintf(new_mask, "%.*s%s", (int)(l1-l2), ban, hidden_host_suffix);
free(ban);
name = ban = new_mask;
}
change = mod_chanmode_alloc(victimCount + 1);
for(n = 0; n < victimCount; ++n)
{
- change->args[n].mode = MODE_REMOVE|MODE_CHANOP|MODE_VOICE;
- change->args[n].member = victims[n];
+ change->args[n].mode = MODE_REMOVE|MODE_CHANOP|MODE_HALFOP|MODE_VOICE;
+ change->args[n].u.member = victims[n];
}
if(!exists)
{
change->args[n].mode = MODE_BAN;
- change->args[n++].hostmask = ban;
+ change->args[n++].u.hostmask = ban;
}
change->argc = n;
if(cmd)
if(!match[ii])
continue;
change->args[count].mode = MODE_REMOVE | MODE_BAN;
- change->args[count++].hostmask = bans->list[ii]->ban;
+ change->args[count++].u.hostmask = strdup(bans->list[ii]->ban);
}
+ assert(count == change->argc);
return change;
}
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;
for(ii=0; ii<channel->banlist.used; ii++)
{
change->args[ii].mode = MODE_REMOVE | MODE_BAN;
- change->args[ii].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;
static CHANSERV_FUNC(cmd_open)
{
struct mod_chanmode *change;
+ unsigned int ii;
change = find_matching_bans(&channel->banlist, user, NULL);
if(!change)
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;
}
{
if(uData->access >= cData->lvlOpts[lvlGiveOps])
string_buffer_append(&sbuf, 'o');
+ else if(uData->access >= cData->lvlOpts[lvlGiveHalfOps])
+ string_buffer_append(&sbuf, 'h');
else if(uData->access >= cData->lvlOpts[lvlGiveVoice])
string_buffer_append(&sbuf, 'v');
}
else
string_buffer_append_string(&sbuf, ")]");
string_buffer_append(&sbuf, '\0');
- send_message_type(4, user, cmd->parent->bot, sbuf.list);
+ send_message_type(4, user, cmd->parent->bot, "%s", sbuf.list);
}
return 1;
&& ((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), channel->name);
/* To prevent possible information leaks, only show infolines
* if the requestor is in the channel or it's their own
* handle. */
return 1;
}
+/* This is never used... */
static void
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);
}
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;
{
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)
{
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)
case HI_STYLE_ZOOT: send_list = def_list; break;
}
}
+ */
lData.users = alloca(channel->channel_info->userCount * sizeof(struct userData *));
matches = 0;
ary = malloc(lData.table.width*sizeof(**lData.table.contents));
lData.table.contents[matches] = ary;
- ary[0] = strtab(uData->access);
+ /* 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] = uData->handle->handle;
if(uData->present)
ary[2] = "Here";
return cmd_list_users(CSFUNC_ARGS, UL_OP, UL_MANAGER-1);
}
+static CHANSERV_FUNC(cmd_hlist)
+{
+ return cmd_list_users(CSFUNC_ARGS, UL_HALFOP, UL_OP-1);
+}
+
static CHANSERV_FUNC(cmd_plist)
{
- return cmd_list_users(CSFUNC_ARGS, 1, UL_OP-1);
+ return cmd_list_users(CSFUNC_ARGS, 1, UL_HALFOP-1);
}
static CHANSERV_FUNC(cmd_bans)
return 1;
}
- change = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE);
+ change = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_REGISTERED);
if(!change)
{
reply("MSG_INVALID_MODES", unsplit_string(argv+1, argc-1, NULL));
if(!(mn->modes & MODE_CHANOP))
{
changes->args[used].mode = MODE_CHANOP;
- changes->args[used++].member = mn;
+ changes->args[used++].u.member = mn;
+ }
+ }
+ else if(!cData->lvlOpts[lvlGiveHalfOps]
+ || (uData && uData->access >= cData->lvlOpts[lvlGiveHalfOps]))
+ {
+ if(!(mn->modes & MODE_HALFOP))
+ {
+ changes->args[used].mode = MODE_HALFOP;
+ changes->args[used++].u.member = mn;
+ }
+ if(mn->modes & MODE_CHANOP)
+ {
+ changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP);
+ changes->args[used++].u.member = mn;
+ }
+ if(mn->modes & MODE_VOICE)
+ {
+ changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
+ changes->args[used++].u.member = mn;
}
}
else if(!cData->lvlOpts[lvlGiveVoice]
if(mn->modes & MODE_CHANOP)
{
changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
- changes->args[used++].member = mn;
+ changes->args[used++].u.member = mn;
+ }
+ if(mn->modes & MODE_HALFOP)
+ {
+ changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
+ changes->args[used++].u.member = mn;
}
if(!(mn->modes & MODE_VOICE))
{
changes->args[used].mode = MODE_VOICE;
- changes->args[used++].member = mn;
+ changes->args[used++].u.member = mn;
}
}
else
if(mn->modes)
{
changes->args[used].mode = MODE_REMOVE | mn->modes;
- changes->args[used++].member = mn;
+ changes->args[used++].u.member = mn;
}
}
}
{
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].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)
{
memset(&channel->channel_info->modes, 0, sizeof(channel->channel_info->modes));
}
- else if(!(new_modes = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE)))
+ else if(!(new_modes = mod_chanmode_parse(channel, argv+1, argc-1, MCP_KEY_FREE|MCP_REGISTERED)))
{
reply("CSMSG_INVALID_MODE_LOCK", unsplit_string(argv+1, argc-1, NULL));
return 0;
mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = AddChannelUser(chanserv, channel);
+ change.args[0].u.member = AddChannelUser(chanserv, channel);
mod_chanmode_announce(chanserv, channel, &change);
}
cData->flags &= ~CHANNEL_OFFCHANNEL;
return 0;
}
break;
+ case lvlGiveHalfOps:
+ if(value < cData->lvlOpts[lvlGiveVoice])
+ {
+ reply("CSMSG_BAD_GIVEHOPS", cData->lvlOpts[lvlGiveHalfOps]);
+ return 0;
+ }
+ break;
case lvlGiveOps:
if(value < cData->lvlOpts[lvlGiveVoice])
{
return channel_level_option(lvlEnfOps, CSFUNC_ARGS);
}
+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);
}
+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);
}
curr_user = owner;
}
+ else if (!force && (now < (time_t)(cData->ownerTransfer + chanserv_conf.giveownership_period)))
+ {
+ char delay[INTERVALLEN];
+ intervalString(delay, cData->ownerTransfer + chanserv_conf.giveownership_period - now, user->handle_info);
+ reply("CSMSG_TRANSFER_WAIT", delay, channel->name);
+ return 0;
+ }
if(!(new_owner_hi = modcmd_get_handle_info(user, argv[1])))
return 0;
if(new_owner_hi == user->handle_info)
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)
{
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)
new_owner->access = UL_OWNER;
if(curr_user)
curr_user->access = co_access;
+ cData->ownerTransfer = now;
reply("CSMSG_OWNERSHIP_GIVEN", channel->name, new_owner_hi->handle);
sprintf(reason, "%s ownership transferred to %s by %s.", channel->name, new_owner_hi->handle, user->handle_info->handle);
global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
return 0;
}
target->flags &= ~USER_SUSPENDED;
+ scan_user_presence(target, NULL);
reply("CSMSG_USER_UNSUSPENDED", hi->handle, channel->name);
return 1;
}
}
change.args[0].mode = MODE_BAN;
- change.args[0].hostmask = bData->mask;
+ change.args[0].u.hostmask = bData->mask;
mod_chanmode_announce(chanserv, channel, &change);
KickChannelUser(user, channel, chanserv, kick_reason);
return 1;
}
else if(cData->lvlOpts[lvlGiveOps] == 0)
modes |= MODE_CHANOP;
+ else if(cData->lvlOpts[lvlGiveHalfOps] == 0)
+ modes |= MODE_HALFOP;
else if(cData->lvlOpts[lvlGiveVoice] == 0)
modes |= MODE_VOICE;
{
if(uData->access >= cData->lvlOpts[lvlGiveOps])
modes |= MODE_CHANOP;
+ if(uData->access >= cData->lvlOpts[lvlGiveHalfOps])
+ modes |= MODE_HALFOP;
else if(uData->access >= cData->lvlOpts[lvlGiveVoice])
modes |= MODE_VOICE;
}
{
if(modes)
{
- if(modes & MODE_CHANOP)
+ if(modes & MODE_CHANOP) {
+ modes &= ~MODE_HALFOP;
modes &= ~MODE_VOICE;
+ }
change.args[0].mode = modes;
- change.args[0].member = mNode;
+ change.args[0].u.member = mNode;
mod_chanmode_announce(chanserv, channel, &change);
}
if(greeting && !user->uplink->burst)
{
if(channel->access >= cn->channel_info->lvlOpts[lvlGiveOps])
change.args[0].mode = MODE_CHANOP;
+ else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveHalfOps])
+ change.args[0].mode = MODE_HALFOP;
else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveVoice])
change.args[0].mode = MODE_VOICE;
else
change.args[0].mode = 0;
- change.args[0].member = mn;
+ change.args[0].u.member = mn;
if(change.args[0].mode)
mod_chanmode_announce(chanserv, cn, &change);
}
struct chanNode *channel = user->channels.list[ii]->channel;
struct banData *ban;
- if((user->channels.list[ii]->modes & (MODE_CHANOP|MODE_VOICE))
- || !channel->channel_info)
+ if((user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE))
+ || !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))
if(!user_matches_glob(user, ban->mask, 1))
continue;
change.args[0].mode = MODE_BAN;
- change.args[0].hostmask = ban->mask;
+ change.args[0].u.hostmask = ban->mask;
mod_chanmode_announce(chanserv, channel, &change);
sprintf(kick_reason, "(%s) %s", ban->owner, ban->reason);
KickChannelUser(user, channel, chanserv, kick_reason);
{
if((change->args[ii].mode & (MODE_REMOVE|MODE_CHANOP)) == (MODE_REMOVE|MODE_CHANOP))
{
- const struct userNode *victim = change->args[ii].member->user;
+ const struct userNode *victim = change->args[ii].u.member->user;
if(!protect_user(victim, user, channel->channel_info))
continue;
if(!bounce)
if(!deopped)
{
bounce->args[bnc].mode = MODE_REMOVE | MODE_CHANOP;
- bounce->args[bnc].member = GetUserMode(channel, user);
- if(bounce->args[bnc].member)
+ bounce->args[bnc].u.member = GetUserMode(channel, user);
+ if(bounce->args[bnc].u.member)
bnc++;
deopped = 1;
}
bounce->args[bnc].mode = MODE_CHANOP;
- bounce->args[bnc].member = change->args[ii].member;
+ bounce->args[bnc].u.member = change->args[ii].u.member;
bnc++;
send_message(user, chanserv, "CSMSG_USER_PROTECTED", victim->nick);
}
else if(change->args[ii].mode & MODE_CHANOP)
{
- const struct userNode *victim = change->args[ii].member->user;
+ const struct userNode *victim = change->args[ii].u.member->user;
if(IsService(victim) || validate_op(user, channel, (struct userNode*)victim))
continue;
if(!bounce)
bounce = mod_chanmode_alloc(change->argc + 1 - ii);
bounce->args[bnc].mode = MODE_REMOVE | MODE_CHANOP;
- bounce->args[bnc].member = change->args[ii].member;
+ bounce->args[bnc].u.member = change->args[ii].u.member;
bnc++;
}
else if((change->args[ii].mode & (MODE_REMOVE | MODE_BAN)) == MODE_BAN)
{
- const char *ban = change->args[ii].hostmask;
+ const char *ban = change->args[ii].u.hostmask;
if(!bad_channel_ban(channel, user, ban, NULL, NULL))
continue;
if(!bounce)
bounce = mod_chanmode_alloc(change->argc + 1 - ii);
bounce->args[bnc].mode = MODE_REMOVE | MODE_BAN;
- bounce->args[bnc].hostmask = ban;
+ bounce->args[bnc].u.hostmask = strdup(ban);
bnc++;
send_message(user, chanserv, "CSMSG_MASK_PROTECTED", ban);
}
{
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);
}
}
{
channel = user->channels.list[ii]->channel;
/* Need not check for bans if they're opped or voiced. */
- if(user->channels.list[ii]->modes & (MODE_CHANOP|MODE_VOICE))
+ if(user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE))
continue;
/* Need not check for bans unless channel registration is active. */
if(!channel->channel_info || IsSuspended(channel->channel_info))
{
if(!user_matches_glob(user, bData->mask, 1))
continue;
- change.args[0].hostmask = bData->mask;
+ change.args[0].u.hostmask = bData->mask;
mod_chanmode_announce(chanserv, channel, &change);
sprintf(kick_reason, "(%s) %s", bData->owner, bData->reason);
KickChannelUser(user, channel, chanserv, kick_reason);
const char *str2 = database_get_data(conf_node, KEY_SUPPORT_CHANNEL_MODES, RECDB_QSTRING);
if(!str2)
str2 = "+nt";
- chan = AddChannel(strlist->list[ii], now, str2, NULL);
+ chan = AddChannel(strlist->list[ii], now, str2, NULL, NULL);
LockChannel(chan);
channelList_append(&chanserv_conf.support_channels, chan);
}
str2 = database_get_data(conf_node, KEY_SUPPORT_CHANNEL_MODES, RECDB_QSTRING);
if(!str2)
str2 = "+nt";
- chan = AddChannel(str, now, str2, NULL);
+ chan = AddChannel(str, now, str2, NULL, NULL);
LockChannel(chan);
channelList_append(&chanserv_conf.support_channels, chan);
}
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);
NickChange(chanserv, str, 0);
str = database_get_data(conf_node, KEY_REFRESH_PERIOD, RECDB_QSTRING);
chanserv_conf.refresh_period = str ? ParseInterval(str) : 3*60*60;
+ str = database_get_data(conf_node, KEY_GIVEOWNERSHIP_PERIOD, RECDB_QSTRING);
+ chanserv_conf.giveownership_period = str ? ParseInterval(str) : 0;
str = database_get_data(conf_node, KEY_CTCP_SHORT_BAN_DURATION, RECDB_QSTRING);
chanserv_conf.ctcp_short_ban_duration = str ? str : "3m";
str = database_get_data(conf_node, KEY_CTCP_LONG_BAN_DURATION, RECDB_QSTRING);
/* free form text */
"DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes",
/* options based on user level */
- "PubCmd", "InviteMe", "UserInfo", "GiveVoice", "GiveOps", "EnfOps",
- "EnfModes", "EnfTopic", "TopicSnarf", "Setters", "CtcpUsers",
+ "PubCmd", "InviteMe", "UserInfo", "GiveVoice", "GiveHalfOps", "GiveOps", "EnfOps",
+ "EnfHalfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters", "CtcpUsers",
/* multiple choice options */
"CtcpReaction", "Protect", "Toys", "TopicRefresh",
/* binary options */
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;
+ off_channel = str ? atoi(str) : 0;
}
static void
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;
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);
str = database_get_data(channel, KEY_REGISTRAR, RECDB_QSTRING);
if(!str)
str = "<unknown>";
- cNode = AddChannel(key, now, NULL, NULL);
+ cNode = AddChannel(key, now, NULL, NULL, NULL);
if(!cNode)
{
log_module(CS_LOG, LOG_ERROR, "Unable to create registered channel %s.", key);
case 'n': lvl = UL_OWNER+1; break;
case 'o': lvl = UL_OP; break;
case 'p': lvl = UL_PEON; break;
+ case 'h': lvl = UL_HALFOP; break;
case 'w': lvl = UL_OWNER; break;
default: lvl = 0; break;
}
/* We could use suspended->expires and suspended->revoked to
* set the CHANNEL_SUSPENDED flag, but we don't. */
}
- else if(IsSuspended(cData))
+ else if(IsSuspended(cData) && (str = database_get_data(hir->d.object, KEY_SUSPENDER, RECDB_QSTRING)))
{
suspended = calloc(1, sizeof(*suspended));
suspended->issued = 0;
suspended->revoked = 0;
+ suspended->suspender = strdup(str);
str = database_get_data(hir->d.object, KEY_SUSPEND_EXPIRES, RECDB_QSTRING);
suspended->expires = str ? atoi(str) : 0;
- suspended->suspender = strdup(database_get_data(hir->d.object, KEY_SUSPENDER, RECDB_QSTRING));
str = database_get_data(hir->d.object, KEY_SUSPEND_REASON, RECDB_QSTRING);
suspended->reason = strdup(str ? str : "No reason");
suspended->previous = NULL;
suspended->cData = cData;
}
else
+ {
+ cData->flags &= ~CHANNEL_SUSPENDED;
suspended = NULL; /* to squelch a warning */
+ }
if(IsSuspended(cData)) {
if(suspended->expires > now)
mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = AddChannelUser(chanserv, cNode);
+ change.args[0].u.member = AddChannelUser(chanserv, cNode);
mod_chanmode_announce(chanserv, cNode, &change);
}
cData->registered = str ? (time_t)strtoul(str, NULL, 0) : now;
str = database_get_data(channel, KEY_VISITED, RECDB_QSTRING);
cData->visited = str ? (time_t)strtoul(str, NULL, 0) : now;
+ str = database_get_data(channel, KEY_OWNER_TRANSFER, RECDB_QSTRING);
+ cData->ownerTransfer = str ? (time_t)strtoul(str, NULL, 0) : 0;
str = database_get_data(channel, KEY_MAX, RECDB_QSTRING);
cData->max = str ? atoi(str) : 0;
str = database_get_data(channel, KEY_GREETING, RECDB_QSTRING);
&& (argc = split_line(str, 0, ArrayLength(argv), argv))
&& (modes = mod_chanmode_parse(cNode, argv, argc, MCP_KEY_FREE))) {
cData->modes = *modes;
- cData->modes.modes_set |= MODE_REGISTERED;
+ if(off_channel > 0)
+ cData->modes.modes_set |= MODE_REGISTERED;
if(cData->modes.argc > 1)
cData->modes.argc = 1;
mod_chanmode_announce(chanserv, cNode, &cData->modes);
saxdb_end_record(ctx);
}
+ if(channel->ownerTransfer)
+ saxdb_write_int(ctx, KEY_OWNER_TRANSFER, channel->ownerTransfer);
saxdb_write_int(ctx, KEY_VISITED, high_present ? now : channel->visited);
saxdb_end_record(ctx);
}
DEFINE_COMMAND(mdelmanager, 2, MODCMD_REQUIRE_CHANUSER, "access", "coowner", NULL);
DEFINE_COMMAND(mdelop, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(mdelpeon, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
+ DEFINE_COMMAND(mdelhalfop, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(trim, 3, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
DEFINE_COMMAND(opchan, 1, MODCMD_REQUIRE_REGCHAN|MODCMD_NEVER_CSUSPEND, "access", "1", NULL);
DEFINE_COMMAND(down, 1, MODCMD_REQUIRE_REGCHAN, NULL);
DEFINE_COMMAND(upall, 1, MODCMD_REQUIRE_AUTHED, NULL);
DEFINE_COMMAND(downall, 1, MODCMD_REQUIRE_AUTHED, NULL);
+ DEFINE_COMMAND(hop, 2, MODCMD_REQUIRE_CHANNEL, "access", "op", NULL);
DEFINE_COMMAND(op, 2, MODCMD_REQUIRE_CHANNEL, "access", "op", NULL);
DEFINE_COMMAND(deop, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
+ DEFINE_COMMAND(dehop, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
DEFINE_COMMAND(voice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
DEFINE_COMMAND(devoice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
DEFINE_COMMAND(clist, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
DEFINE_COMMAND(mlist, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
DEFINE_COMMAND(olist, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
+ DEFINE_COMMAND(hlist, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
DEFINE_COMMAND(plist, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
DEFINE_COMMAND(info, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
DEFINE_COMMAND(seen, 2, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog,+joinable", NULL);
DEFINE_CHANNEL_OPTION(usergreeting);
DEFINE_CHANNEL_OPTION(modes);
DEFINE_CHANNEL_OPTION(enfops);
+ DEFINE_CHANNEL_OPTION(enfhalfops);
DEFINE_CHANNEL_OPTION(giveops);
+ DEFINE_CHANNEL_OPTION(givehalfops);
DEFINE_CHANNEL_OPTION(protect);
DEFINE_CHANNEL_OPTION(enfmodes);
DEFINE_CHANNEL_OPTION(enftopic);
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);
dict_set_free_data(note_types, chanserv_deref_note_type);
if(nick)
{
- chanserv = AddService(nick, "Channel Services", NULL);
+ const char *modes = conf_get_data("services/chanserv/modes", RECDB_QSTRING);
+ chanserv = AddService(nick, modes ? modes : NULL, "Channel Services", NULL);
service_register(chanserv)->trigger = '!';
reg_chanmsg_func('\001', chanserv, chanserv_ctcp_check);
}
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);
}
projects / irc / evilnet / x3.git / blobdiff