{ "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." },
{ "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." },
{ "MCMSG_BAD_OPSERV_LEVEL", "Invalid $O access level %s." },
+ { "MCMSG_BAD_STAFF_LEVEL", "Invalid staff level %s." },
{ "MCMSG_BAD_CHANSERV_LEVEL", "Invalid $C access level %s." },
{ "MCMSG_LEVEL_TOO_LOW", "You cannot set the access requirements for %s (your level is too low.)" },
{ "MCMSG_LEVEL_TOO_HIGH", "You cannot set the access requirements to %s (that is too high)." },
{ "MCMSG_HELPFILE_READ", "Read %s help database in %lu.%03lu seconds." },
{ "MCMSG_COMMAND_TIME", "Command $b%s$b finished in %lu.%06lu seconds." },
{ "MCMSG_NEED_OPSERV_LEVEL", "You must have $O access of at least $b%u$b." },
+ { "MCMSG_NEED_STAFF_LEVEL", "You must have staff access of at least $b%u$b." },
{ "MCMSG_NEED_CHANSERV_LEVEL", "You must have $C access of at least $b%u$b in the channel." },
{ "MCMSG_NEED_ACCOUNT_FLAGS", "You must have account flags $b%s$b." },
{ "MCMSG_NEED_NOTHING", "Anyone may use the $b%s$b command." },
{ "MCMSG_MESSAGE_DUMP_FAILED", "Message dump failed: %s." },
{ "MCMSG_COMMAND_FLAGS", "Command flags are %s (inferred: %s)." },
{ "MCMSG_COMMAND_ACCOUNT_FLAGS", "Requires account flags +%s, prohibits account flags +%s." },
- { "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d." },
+ { "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d and staff access %d." },
{ "MCMSG_COMMAND_USES", "%s has been used %d times." },
{ NULL, NULL }
};
dest->deny_account_flags |= src->deny_account_flags;
if (src->min_opserv_level > dest->min_opserv_level)
dest->min_opserv_level = src->min_opserv_level;
+ if (src->min_staff_level > dest->min_staff_level)
+ dest->min_staff_level = src->min_staff_level;
if (src->min_channel_access > dest->min_channel_access)
dest->min_channel_access = src->min_channel_access;
modcmd_set_effective_flags(dest);
}
cmd->min_opserv_level = newval;
return 1;
+ } else if (!irccasecmp(param, "staff_level") || !irccasecmp(param, "staff_access")) {
+ unsigned int newval = atoi(value);
+ if (newval > 1000) {
+ if (user) {
+ send_message(user, bot, "MCMSG_BAD_STAFF_LEVEL", value);
+ } else {
+ log_module(MAIN_LOG, LOG_ERROR, "Invalid staff level %s (for command %s).", value, cmd->name);
+ }
+ return 0;
+ }
+ cmd->min_staff_level = newval;
+ return 1;
} else if (!irccasecmp(param, "account_flags")) {
return nickserv_modify_handle_flags(user, bot, value, &cmd->req_account_flags, &cmd->deny_account_flags);
} else {
send_message(user, bot, "MCMSG_CHAN_SUSPENDED", channel->name, channel->channel_info->suspended->reason);
return 0;
}
+ if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
rflags |= ACTION_STAFF;
}
}
|| ((flags & MODCMD_REQUIRE_NETWORK_HELPER) && IsNetworkHelper(user))
|| ((flags & MODCMD_REQUIRE_SUPPORT_HELPER) && IsSupportHelper(user))) {
/* allow it */
+ if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
rflags |= ACTION_STAFF;
} else {
if (options & SVCCMD_NOISY)
send_message(user, bot, "MCMSG_MUST_BE_HELPING");
return 0;
}
+ if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
rflags |= ACTION_STAFF;
}
if (cmd->min_opserv_level > 0) {
- if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY)))
- return 0;
+ if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) return 0;
+ if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
rflags |= ACTION_STAFF;
}
if (cmd->req_account_flags || cmd->deny_account_flags) {
&& (!(uData = _GetChannelUser(channel->channel_info, user->handle_info, 0, 0))
|| uData->access < cmd->min_channel_access)
&& !(flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING))) {
+ if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
rflags |= ACTION_OVERRIDE;
}
return rflags | ACTION_ALLOW;
/* Expand the alias arguments, if there are any. */
if (cmd->alias.used) {
- char *new_argv[MAXNUMPARAMS];
+ char *old_argv[MAXNUMPARAMS];
int res;
+ unsigned int nn;
+
+ for(nn=0;nn<argc;nn++)
+ old_argv[nn] = argv[nn];
- res = svccmd_expand_alias(cmd, argc, argv, new_argv);
+ res = svccmd_expand_alias(cmd, argc, old_argv, argv);
if (res < 0) {
send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name);
return 0;
return 0;
}
argc = res;
- argv = new_argv;
/* Try again to grab a handle to the channel after alias
* expansion, overwriting any previous channel. This should,
* users, except to add copyright information pertaining
* to changes you make to srvx.
*/
- snprintf(response, sizeof(response), "\x01VERSION %s (%s) %s\x01", PACKAGE_STRING, CODENAME, git_version);
+ snprintf(response, sizeof(response), "\x01VERSION %s (%s) GIT Revision: %s\x01", PACKAGE_STRING, CODENAME, git_version);
irc_notice_user(bot, user, response);
}
return;
reply("MCMSG_NEED_OPSERV_LEVEL", svccmd->min_opserv_level);
shown_flags |= MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_AUTHED;
}
+ if (svccmd->min_staff_level > 0) { // && (IsNetworkHelper(user) || IsSupportHelper(user) || IsOper(user))
+ reply("MCMSG_NEED_STAFF_LEVEL", svccmd->min_staff_level);
+ shown_flags |= MODCMD_REQUIRE_STAFF | MODCMD_REQUIRE_AUTHED;
+ }
if (svccmd->min_channel_access > 0) {
reply("MCMSG_NEED_CHANSERV_LEVEL", svccmd->min_channel_access);
shown_flags |= MODCMD_REQUIRE_CHANUSER | MODCMD_REQUIRE_REGCHAN | MODCMD_REQUIRE_CHANNEL | MODCMD_REQUIRE_AUTHED;
}
buf1[buf1_used] = buf2[buf2_used] = '\0';
reply("MCMSG_COMMAND_ACCOUNT_FLAGS", buf1, buf2);
- reply("MCMSG_COMMAND_ACCESS_LEVEL", target->min_channel_access, target->min_opserv_level);
+ reply("MCMSG_COMMAND_ACCESS_LEVEL", target->min_channel_access, target->min_opserv_level, target->min_staff_level);
reply("MCMSG_COMMAND_USES", target->name, target->uses);
}
if (argc < 2) {
tbl.length = dict_size(services) + 1;
- tbl.width = 4;
+ tbl.width = 5;
tbl.flags = TABLE_PAD_LEFT;
tbl.contents = calloc(tbl.length, sizeof(tbl.contents[0]));
tbl.contents[0] = calloc(tbl.width, sizeof(tbl.contents[0][0]));
tbl.contents[0][1] = "Commands";
tbl.contents[0][2] = "Priv'd?";
tbl.contents[0][3] = "Trigger";
+ tbl.contents[0][4] = "Offchannel";
extra = calloc(2, tbl.length);
for (ii=1, it=dict_first(services); it; it=iter_next(it), ii++) {
service = iter_data(it);
tbl.contents[ii] = calloc(tbl.width, sizeof(tbl.contents[ii][0]));
tbl.contents[ii][0] = service->bot->nick;
- tbl.contents[ii][1] = strtab(dict_size(service->commands));
+ tbl.contents[ii][1] = (service->commands && dict_size(service->commands) ? strtab(dict_size(service->commands)) : strtab(0));
tbl.contents[ii][2] = service->privileged ? "yes" : "no";
extra[ii*2] = service->trigger;
tbl.contents[ii][3] = extra+ii*2;
+ tbl.contents[ii][4] = offchannel_allowed[(unsigned char)service->trigger] ? "yes" : "no";
}
table_send(cmd->parent->bot, user->nick, 0, 0, tbl);
free(extra);
* command or its accessibility to normal IRC users, except to add
* copyright information pertaining to changes you make to srvx.
*/
- send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), Built: "__DATE__", "__TIME__". Copyright 2000-2008 srvx Development Team.");
- if (argc > 1)
- send_message_type(4, user, cmd->parent->bot, "%s", git_version);
- else
- send_message_type(12, user, cmd->parent->bot, "The srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.");
+ send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), GIT Revision: %s, Built: "__DATE__", "__TIME__". Copyright 2000-2008 srvx Development Team.", git_version);
+ send_message_type(12, user, cmd->parent->bot, "The srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.\nThis version has been modified by pk910, Stricted, NurPech - visit #dev @ irc.nextirc.net.");
return 1;
}
saxdb_write_string_list(ctx, "aliased", &cmd->alias);
if (cmd->min_opserv_level != template->min_opserv_level)
saxdb_write_int(ctx, "oper_access", cmd->min_opserv_level);
+ if (cmd->min_staff_level != template->min_staff_level)
+ saxdb_write_int(ctx, "staff_access", cmd->min_staff_level);
if (cmd->min_channel_access != template->min_channel_access)
saxdb_write_int(ctx, "channel_access", cmd->min_channel_access);
if (cmd->flags != template->flags) {
|| (str = database_get_data(obj, "opserv_level", RECDB_QSTRING))) {
svccmd_configure(svccmd, NULL, service->bot, "oper_access", str);
}
+ if ((str = database_get_data(obj, "staff_access", RECDB_QSTRING))
+ || (str = database_get_data(obj, "staff_level", RECDB_QSTRING))) {
+ svccmd_configure(svccmd, NULL, service->bot, "staff_access", str);
+ }
if ((str = database_get_data(obj, "channel_access", RECDB_QSTRING))
|| (str = database_get_data(obj, "chanserv_level", RECDB_QSTRING))) {
svccmd_configure(svccmd, NULL, service->bot, "channel_access", str);
struct svccmd *svccmd;
svccmd = service_make_alias(service, "stats", "*modcmd.joiner", NULL);
svccmd->min_opserv_level = 101;
+ svccmd = service_make_alias(service, "devnull", "*modcmd.joiner", NULL);
+ svccmd->min_opserv_level = 200;
svccmd = service_make_alias(service, "service", "*modcmd.joiner", NULL);
svccmd->min_opserv_level = 900;
}
projects / srvx.git / blobdiff