X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodcmd.c;h=bb3199fea23bba07c84938665c1f9db032406d7c;hb=6385ddd8822a295c5b9b875ea52289b28f2df6d6;hp=53bb49004c489850afbf2ff6202f71c726357430;hpb=fb43f026602d2cc87eef884f5616cd0925408c3e;p=srvx.git

diff --git a/src/modcmd.c b/src/modcmd.c
index 53bb490..bb3199f 100644
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -34,10 +34,12 @@ static struct dict *services;
 static struct pending_template *pending_templates;
 static struct module *modcmd_module;
 static struct modcmd *bind_command, *help_command, *version_command;
+unsigned short offchannel_allowed[256] = { 0 };
 static const struct message_entry msgtab[] = {
     { "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)." },
@@ -76,6 +78,7 @@ static const struct message_entry msgtab[] = {
     { "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." },
@@ -115,13 +118,17 @@ static const struct message_entry msgtab[] = {
     { "MCMSG_CURRENT_TRIGGER", "Trigger for $b%s$b is $b%c$b." },
     { "MCMSG_NEW_TRIGGER", "Changed trigger for $b%s$b to $b%c$b." },
     { "MCMSG_SERVICE_PRIVILEGED", "Service $b%s$b privileged: $b%s$b." },
+    { "MCMSG_OFFCHANNEL_IS_ON", "Off-channel use for $b%s$b (trigger $b%c$b) is enabled" },
+    { "MCMSG_OFFCHANNEL_IS_OFF", "Off-channel use for $b%s$b (trigger $b%c$b) is disabled" },
+    { "MCMSG_OFFCHANNEL_ON", "Enabled off-channel use for $b%s$b (trigger $b%c$b)" },
+    { "MCMSG_OFFCHANNEL_OFF", "Disabled off-channel use for $b%s$b (trigger $b%c$b)" },
     { "MCMSG_SERVICE_REMOVED", "Service $b%s$b has been deleted." },
     { "MCMSG_FILE_NOT_OPENED", "Unable to open file $b%s$b for writing." },
     { "MCMSG_MESSAGES_DUMPED", "Messages written to $b%s$b." },
     { "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 }
 };
@@ -297,6 +304,8 @@ svccmd_copy_rules(struct svccmd *dest, struct svccmd *src) {
     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);
@@ -374,6 +383,18 @@ svccmd_configure(struct svccmd *cmd, struct userNode *user, struct userNode *bot
         }
         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 {
@@ -482,6 +503,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
                         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;
             }
         }
@@ -533,6 +555,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
             || ((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)
@@ -546,11 +569,12 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
                 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) {
@@ -575,6 +599,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
         && (!(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;
@@ -889,7 +914,7 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, in
              * 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;
@@ -990,9 +1015,10 @@ check_alias_args(char *argv[], unsigned int argc) {
             continue;
         } else if (isdigit(argv[arg][1])) {
             char *end_num;
-            unsigned long tmp;
+            unsigned int tmp;
 
             tmp = strtoul(argv[arg]+1, &end_num, 10);
+            (void)tmp;
             switch (end_num[0]) {
             case 0:
                 continue;
@@ -1296,6 +1322,10 @@ static MODCMD_FUNC(cmd_command) {
         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;
@@ -1418,7 +1448,7 @@ modcmd_describe_command(struct userNode *user, struct svccmd *cmd, struct svccmd
     }
     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);
 }
 
@@ -1568,7 +1598,7 @@ static MODCMD_FUNC(cmd_stats_services) {
 
     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]));
@@ -1576,15 +1606,17 @@ static MODCMD_FUNC(cmd_stats_services) {
         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);
@@ -1772,6 +1804,7 @@ static MODCMD_FUNC(cmd_service_rename) {
 static MODCMD_FUNC(cmd_service_trigger) {
     struct userNode *bogon;
     struct service *service;
+    int old_oc = 0;
 
     if (!(service = service_find(argv[1]))) {
         reply("MCMSG_UNKNOWN_SERVICE", argv[1]);
@@ -1784,9 +1817,13 @@ static MODCMD_FUNC(cmd_service_trigger) {
             reply("MCMSG_NO_TRIGGER", service->bot->nick);
         return 1;
     }
-    if (service->trigger)
+    if (service->trigger) {
+        old_oc = offchannel_allowed[(unsigned char)service->trigger];
+        offchannel_allowed[(unsigned char)service->trigger] = 0;
         reg_chanmsg_func(service->trigger, NULL, NULL);
+    }
     if (!irccasecmp(argv[2], "none") || !irccasecmp(argv[2], "remove")) {
+        offchannel_allowed[(unsigned char)service->trigger] = 0;
         service->trigger = 0;
         reply("MCMSG_REMOVED_TRIGGER", service->bot->nick);
     } else if ((bogon = get_chanmsg_bot(argv[2][0]))) {
@@ -1794,12 +1831,48 @@ static MODCMD_FUNC(cmd_service_trigger) {
         return 1;
     } else {
         service->trigger = argv[2][0];
+        offchannel_allowed[(unsigned char)service->trigger] = old_oc;
         reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg);
         reply("MCMSG_NEW_TRIGGER", service->bot->nick, service->trigger);
     }
     return 1;
 }
 
+static MODCMD_FUNC(cmd_service_offchannel) {
+    struct service *service;
+
+    if (!(service = service_find(argv[1]))) {
+        reply("MCMSG_UNKNOWN_SERVICE", argv[1]);
+        return 0;
+    }
+
+    if(!service->trigger) {
+        reply("MCMSG_NO_TRIGGER", service->bot->nick);
+        return 0;
+    }
+
+    if(argc < 3) {
+        if(offchannel_allowed[(unsigned char)service->trigger])
+            reply("MCMSG_OFFCHANNEL_IS_ON", service->bot->nick, service->trigger);
+        else
+            reply("MCMSG_OFFCHANNEL_IS_OFF", service->bot->nick, service->trigger);
+        return 1;
+    }
+
+    if(enabled_string(argv[2])) {
+        offchannel_allowed[(unsigned char)service->trigger] = 1;
+        reply("MCMSG_OFFCHANNEL_ON", service->bot->nick, service->trigger);
+    } else if(disabled_string(argv[2])) {
+        offchannel_allowed[(unsigned char)service->trigger] = 0;
+        reply("MCMSG_OFFCHANNEL_OFF", service->bot->nick, service->trigger);
+    } else {
+        reply("MSG_INVALID_BINARY", argv[2]);
+        return 0;
+    }
+
+    return 1;
+}
+
 static MODCMD_FUNC(cmd_service_privileged) {
     struct service *service;
     const char *newval;
@@ -1868,11 +1941,8 @@ static MODCMD_FUNC(cmd_version) {
      * 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 - visit #srvx @ irc.nextirc.net.\nThis version has been modified by Stricted - visit #dev @ irc.easy-scripting.net.");
     return 1;
 }
 
@@ -1920,6 +1990,8 @@ modcmd_saxdb_write_command(struct saxdb_context *ctx, struct svccmd *cmd) {
         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) {
@@ -1971,15 +2043,23 @@ modcmd_saxdb_write(struct saxdb_context *ctx) {
     saxdb_start_record(ctx, "bots", 1);
     for (it = dict_first(services); it; it = iter_next(it)) {
         char buff[16];
+        char modes[32];
+
         service = iter_data(it);
         saxdb_start_record(ctx, service->bot->nick, 1);
         if (service->trigger) {
             buff[0] = service->trigger;
             buff[1] = '\0';
             saxdb_write_string(ctx, "trigger", buff);
+            if(offchannel_allowed[(unsigned char)service->trigger])
+                saxdb_write_int(ctx, "offchannel", 1);
         }
         saxdb_write_string(ctx, "description", service->bot->info);
         saxdb_write_string(ctx, "hostname", service->bot->hostname);
+        if (service->bot->modes) {
+            irc_user_modes(service->bot, modes, sizeof(modes));
+            saxdb_write_string(ctx, "modes", modes);
+        }
         if (service->privileged)
             saxdb_write_string(ctx, "privileged", "1");
         saxdb_end_record(ctx);
@@ -2064,7 +2144,7 @@ modcmd_load_bots(struct dict *db, int default_nick) {
     for (it = dict_first(db); it; it = iter_next(it)) {
         struct record_data *rd;
         struct service *svc;
-        const char *nick, *desc, *hostname;
+        const char *nick, *desc, *hostname, *modes;
 
         rd = iter_data(it);
         if (rd->type != RECDB_OBJECT) {
@@ -2081,14 +2161,19 @@ modcmd_load_bots(struct dict *db, int default_nick) {
         svc = service_find(nick);
         desc = database_get_data(rd->d.object, "description", RECDB_QSTRING);
         hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
+        modes = database_get_data(rd->d.object, "modes", RECDB_QSTRING);
         if (desc) {
             if (!svc)
-                svc = service_register(AddLocalUser(nick, nick, hostname, desc, NULL));
+                svc = service_register(AddLocalUser(nick, nick, hostname, desc, modes));
             else if (hostname)
                 strcpy(svc->bot->hostname, hostname);
             desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
-            if (desc)
+            if (desc) {
                 svc->trigger = desc[0];
+                desc = database_get_data(rd->d.object, "offchannel", RECDB_QSTRING);
+                if(desc)
+                    offchannel_allowed[(unsigned char)svc->trigger] = atoi(desc);
+            }
             desc = database_get_data(rd->d.object, "privileged", RECDB_QSTRING);
             if (desc && (true_string(desc) || enabled_string(desc)))
                 svc->privileged = 1;
@@ -2129,6 +2214,7 @@ modcmd_init(void) {
     modcmd_register(modcmd_module, "service add", cmd_service_add, 4, 0, "flags", "+oper", NULL);
     modcmd_register(modcmd_module, "service rename", cmd_service_rename, 3, 0, "flags", "+oper", NULL);
     modcmd_register(modcmd_module, "service trigger", cmd_service_trigger, 2, 0, "flags", "+oper", NULL);
+    modcmd_register(modcmd_module, "service offchannel", cmd_service_offchannel, 2, 0, "flags", "+oper", NULL);
     modcmd_register(modcmd_module, "service privileged", cmd_service_privileged, 2, 0, "flags", "+oper", NULL);
     modcmd_register(modcmd_module, "service remove", cmd_service_remove, 2, 0, "flags", "+oper", NULL);
     modcmd_register(modcmd_module, "dumpmessages", cmd_dump_messages, 1, 0, "oper_level", "1000", NULL);
@@ -2186,6 +2272,10 @@ modcmd_db_load_command(struct service *service, const char *cmdname, struct dict
         || (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);
@@ -2357,6 +2447,8 @@ create_default_binds(void) {
             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;
         }