{ "OSMSG_OP_DONE", "Opped the requested lusers." },
{ "OSMSG_OPALL_DONE", "Opped everyone on $b%s$b." },
{ "OSMSG_WHOIS_IDENT", "%s (%s@%s) from %d.%d.%d.%d" },
- { "OSMSG_WHOIS_NICK", "Nick : %s" },
- { "OSMSG_WHOIS_HOST", "Host : %s@%s" },
- { "OSMSG_WHOIS_FAKEHOST", "Fakehost: %s" },
- { "OSMSG_WHOIS_IP", "Real IP : %s" },
- { "OSMSG_WHOIS_MODES", "Modes : +%s " },
- { "OSMSG_WHOIS_INFO", "Info : %s" },
- { "OSMSG_WHOIS_NUMERIC", "Numnick : %s" },
- { "OSMSG_WHOIS_SERVER", "Server : %s" },
- { "OSMSG_WHOIS_NICK_AGE", "Nick Age: %s" },
- { "OSMSG_WHOIS_ACCOUNT", "Account : %s" },
- { "OSMSG_WHOIS_CHANNELS", "Channels: %s" },
+ { "OSMSG_WHOIS_NICK", "Nick : %s" },
+ { "OSMSG_WHOIS_HOST", "Host : %s@%s" },
+ { "OSMSG_WHOIS_FAKEHOST", "Fakehost : %s" },
+ { "OSMSG_WHOIS_FAKEIDENT", "Fakeident: %s" },
+ { "OSMSG_WHOIS_FAKEIDENTHOST", "Fakehost : %s@%s" },
+ { "OSMSG_WHOIS_IP", "Real IP : %s" },
+ { "OSMSG_WHOIS_MODES", "Modes : +%s " },
+ { "OSMSG_WHOIS_INFO", "Info : %s" },
+ { "OSMSG_WHOIS_NUMERIC", "Numnick : %s" },
+ { "OSMSG_WHOIS_SERVER", "Server : %s" },
+ { "OSMSG_WHOIS_NICK_AGE", "Nick Age : %s" },
+ { "OSMSG_WHOIS_ACCOUNT", "Account : %s" },
+ { "OSMSG_WHOIS_CHANNELS", "Channels : %s" },
{ "OSMSG_WHOIS_HIDECHANS", "Channel list omitted for your sanity." },
{ "OSMSG_UNBAN_DONE", "Ban(s) removed from channel %s." },
{ "OSMSG_CHANNEL_VOICED", "All users on %s voiced." },
{ "OSMSG_GLINE_SEARCH_RESULTS", "The following glines were found:" },
{ "OSMSG_LOG_SEARCH_RESULTS", "The following log entries were found:" },
{ "OSMSG_GSYNC_RUNNING", "Synchronizing glines from %s." },
- { "OSMSG_GTRACE_FORMAT", "%s (issued %s by %s, lastmod %s, expires %s): %s" },
+ { "OSMSG_GTRACE_FORMAT", "%1$s (issued %2$s ago by %3$s, lastmod %4$s ago, expires %5$s, lifetime %7$s): %6$s" },
+ { "OSMSG_GTRACE_FOREVER", "%1$s (issued %2$s ago by %3$s, lastmod %4$s ago, never expires, lifetime %7$s): %6$s" },
+ { "OSMSG_GTRACE_EXPIRED", "%1$s (issued %2$s ago by %3$s, lastmod %4$s ago, expired %5$s ago, lifetime %7$s): %6$s" },
{ "OSMSG_GAG_APPLIED", "Gagged $b%s$b, affecting %d users." },
{ "OSMSG_GAG_ADDED", "Gagged $b%s$b." },
{ "OSMSG_REDUNDANT_GAG", "Gag $b%s$b is redundant." },
const char *fmt;
struct banNode *ban;
struct modeNode *moden;
+ struct modeNode **members;
time_t feh;
unsigned int n;
+ int show_oplevels;
reply("OSMSG_CHANINFO_HEADER", channel->name);
fmt = user_find_message(user, "OSMSG_CHANINFO_TIMESTAMP");
return 1;
}
reply("OSMSG_CHANINFO_USER_COUNT", channel->members.used);
+
+ /* Create and sort the members array. */
+ members = alloca(channel->members.used * sizeof(members[0]));
+ for (n=0; n<channel->members.used; n++)
+ members[n] = channel->members.list[n];
+ qsort(members, channel->members.used, sizeof(members[0]), modeNode_sort);
+
+ /* Display the array. */
+ show_oplevels = (channel->members.used != 0)
+ && (members[0]->modes & MODE_CHANOP)
+ && (members[0]->oplevel < MAXOPLEVEL);
for (n=0; n<channel->members.used; n++) {
- moden = channel->members.list[n];
+ moden = members[n];
if (moden->modes & MODE_CHANOP) {
- if (moden->oplevel >= 0)
+ if (show_oplevels)
send_message_type(4, user, cmd->parent->bot, " @%s:%d (%s@%s)", moden->user->nick, moden->oplevel, moden->user->ident, moden->user->hostname);
else
send_message_type(4, user, cmd->parent->bot, " @%s (%s@%s)", moden->user->nick, moden->user->ident, moden->user->hostname);
- }
- }
- for (n=0; n<channel->members.used; n++) {
- moden = channel->members.list[n];
- if ((moden->modes & (MODE_CHANOP|MODE_VOICE)) == MODE_VOICE)
+ } else if (moden->modes & MODE_VOICE)
send_message_type(4, user, cmd->parent->bot, " +%s (%s@%s)", moden->user->nick, moden->user->ident, moden->user->hostname);
- }
- for (n=0; n<channel->members.used; n++) {
- moden = channel->members.list[n];
- if ((moden->modes & (MODE_CHANOP|MODE_VOICE)) == 0)
+ else
send_message_type(4, user, cmd->parent->bot, " %s (%s@%s)", moden->user->nick, moden->user->ident, moden->user->hostname);
}
+
return 1;
}
return 0;
}
mod_chanmode_init(&change);
- change.modes_clear = channel->modes;
+ change.modes_clear = channel->modes & ~MODE_REGISTERED;
modcmd_chanmode_announce(&change);
reply("OSMSG_CLEARMODES_DONE", channel->name);
return 1;
"G-line requested by %s.", src_handle);
if (!duration)
duration = opserv_conf.block_gline_duration;
- return gline_add(src_handle, mask, duration, reason, now, now, 1);
+ return gline_add(src_handle, mask, duration, reason, now, now, 0, 1);
}
static MODCMD_FUNC(cmd_block)
reply("MSG_INVALID_DURATION", argv[2]);
return 0;
}
- gline = gline_add(user->handle_info->handle, argv[1], duration, reason, now, now, 1);
+ gline = gline_add(user->handle_info->handle, argv[1], duration, reason, now, now, 0, 1);
reply("OSMSG_GLINE_ISSUED", gline->target);
return 1;
}
reply("OSMSG_NOT_ON_CHANNEL", target->nick, channel->name);
return 0;
}
+ if (IsService(target)) {
+ reply("MSG_SERVICE_IMMUNE", target->nick);
+ return 0;
+ }
KickChannelUser(target, channel, cmd->parent->bot, reason);
return 1;
}
}
reply("OSMSG_WHOIS_NICK", target->nick);
reply("OSMSG_WHOIS_HOST", target->ident, target->hostname);
- if (IsFakeHost(target))
+ if (IsFakeIdent(target) && IsFakeHost(target))
+ reply("OSMSG_WHOIS_FAKEIDENTHOST", target->fakeident, target->fakehost);
+ else if (IsFakeIdent(target))
+ reply("OSMSG_WHOIS_FAKEIDENT", target->fakeident);
+ else if (IsFakeHost(target))
reply("OSMSG_WHOIS_FAKEHOST", target->fakehost);
reply("OSMSG_WHOIS_IP", irc_ntoa(&target->ip));
if (target->modes) {
- bpos = 0;
+ bpos = irc_user_modes(target, buffer, sizeof(buffer));
#define buffer_cat(str) (herelen = strlen(str), memcpy(buffer+bpos, str, herelen), bpos += herelen)
- if (IsInvisible(target)) buffer[bpos++] = 'i';
- if (IsWallOp(target)) buffer[bpos++] = 'w';
- if (IsOper(target)) buffer[bpos++] = 'o';
- if (IsGlobal(target)) buffer[bpos++] = 'g';
- if (IsService(target)) buffer[bpos++] = 'k';
- if (IsDeaf(target)) buffer[bpos++] = 'd';
- if (IsNoChan(target)) buffer[bpos++] = 'n';
- if (IsHiddenHost(target)) buffer[bpos++] = 'x';
- if (IsNoIdle(target)) buffer[bpos++] = 'I';
if (IsGagged(target)) buffer_cat(" (gagged)");
if (IsRegistering(target)) buffer_cat(" (registered account)");
buffer[bpos] = 0;
#endif
tbl.contents[nn][1] = buffer;
ofs = strlen(buffer) + 1;
- intervalString(buffer + ofs, now - server->link, user->handle_info);
+ intervalString(buffer + ofs, now - server->link_time, user->handle_info);
if (server->self_burst)
strcat(buffer + ofs, " Bursting");
tbl.contents[nn][2] = buffer + ofs;
} else if (ohi->clients.used > limit) {
char target[IRC_NTOP_MAX_SIZE + 3] = { '*', '@', '\0' };
strcpy(target + 2, addr);
- gline_add(opserv->nick, target, opserv_conf.clone_gline_duration, "AUTO Excessive connections from a single host.", now, now, 1);
+ gline_add(opserv->nick, target, opserv_conf.clone_gline_duration, "AUTO Excessive connections from a single host.", now, now, 0, 1);
}
}
}
reply("OSMSG_BAD_NUKING", orig_bad);
string_list_delete(opserv_bad_words, bad_idx);
bad_idx--;
- free(orig_bad);
}
return 1;
}
/* Scan for existing channels that match the new bad word. */
if (!bad_found) {
for (it = dict_first(channels); it; it = iter_next(it)) {
- struct chanNode *channel = iter_data(it);
+ struct chanNode *chan = iter_data(it);
- if (!opserv_bad_channel(channel->name))
+ if (!opserv_bad_channel(chan->name))
continue;
- channel->bad_channel = 1;
- if (channel->name[0] == '#')
- opserv_shutdown_channel(channel, "OSMSG_ILLEGAL_REASON");
+ chan->bad_channel = 1;
+ if (chan->name[0] == '#')
+ opserv_shutdown_channel(chan, "OSMSG_ILLEGAL_REASON");
else {
unsigned int nn;
- for (nn=0; nn<channel->members.used; nn++) {
- struct userNode *user = channel->members.list[nn]->user;
- DelUser(user, cmd->parent->bot, 1, "OSMSG_ILLEGAL_KILL_REASON");
+ for (nn = 0; nn < chan->members.used; nn++) {
+ struct userNode *victim = chan->members.list[nn]->user;
+ DelUser(victim, cmd->parent->bot, 1, "OSMSG_ILLEGAL_KILL_REASON");
}
}
}
return 0;
}
count = strtoul(argv[2], &tmp, 10);
- if (!count || *tmp) {
+ if (*tmp != '\0') {
reply("OSMSG_BAD_NUMBER", argv[2]);
return 0;
}
static int
discrim_match(discrim_t discrim, struct userNode *user)
{
- unsigned int access, i;
+ unsigned int level, i;
if ((user->timestamp < discrim->min_ts)
|| (user->timestamp > discrim->max_ts)
for(i = 0; i < discrim->channel_count; i++)
if (!GetUserMode(discrim->channels[i], user))
return 0;
- access = user->handle_info ? user->handle_info->opserv_level : 0;
- if ((access < discrim->min_level)
- || (access > discrim->max_level)) {
+ level = user->handle_info ? user->handle_info->opserv_level : 0;
+ if ((level < discrim->min_level)
+ || (level > discrim->max_level)) {
return 0;
}
if (discrim->min_clones > 1) {
char issued[INTERVALLEN];
char lastmod[INTERVALLEN];
char expires[INTERVALLEN];
+ char lifetime[INTERVALLEN];
intervalString(issued, now - gline->issued, xtra->user->handle_info);
if (gline->lastmod)
intervalString(lastmod, now - gline->lastmod, xtra->user->handle_info);
else
strcpy(lastmod, "<unknown>");
- if (gline->expires)
+ intervalString(lifetime, gline->lifetime - now, xtra->user->handle_info);
+ if (!gline->expires) {
+ send_message(xtra->user, opserv, "OSMSG_GTRACE_FOREVER", gline->target, issued, gline->issuer, lastmod, NULL, gline->reason, lifetime);
+ } else if (gline->expires < now) {
+ intervalString(expires, now - gline->expires, xtra->user->handle_info);
+ send_message(xtra->user, opserv, "OSMSG_GTRACE_EXPIRED", gline->target, issued, gline->issuer, lastmod, expires, gline->reason, lifetime);
+ } else { /* must be in the future */
intervalString(expires, gline->expires - now, xtra->user->handle_info);
- else
- strcpy(expires, "never");
- send_message(xtra->user, opserv, "OSMSG_GTRACE_FORMAT", gline->target, issued, gline->issuer, lastmod, expires, gline->reason);
+ send_message(xtra->user, opserv, "OSMSG_GTRACE_FORMAT", gline->target, issued, gline->issuer, lastmod, expires, gline->reason, lifetime);
+ }
}
static MODCMD_FUNC(cmd_stats_glines) {
send_channel_notice(opserv_conf.staff_auth_channel, opserv, IDENT_FORMAT" authed to %s account %s", IDENT_DATA(user), type, user->handle_info->handle);
else
send_channel_notice(opserv_conf.staff_auth_channel, opserv, "%s [%s@%s] authed to %s account %s", user->nick, user->ident, user->hostname, type, user->handle_info->handle);
+}
- dict_foreach(opserv_account_alerts, alert_check_user, user);
+static void
+opserv_auth_alert(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
+{
+ if (!user->uplink->burst && user->handle_info)
+ dict_foreach(opserv_account_alerts, alert_check_user, user);
}
static MODCMD_FUNC(cmd_log)
reg_del_channel_func(opserv_channel_delete);
reg_join_func(opserv_join_check);
reg_auth_func(opserv_staff_alert);
+ reg_auth_func(opserv_auth_alert);
opserv_db_init();
saxdb_register("OpServ", opserv_saxdb_read, opserv_saxdb_write);