X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/63aaa6dcc4b07894450863de46723692ffdee6fb..0b401fb654b69fd9649954a9bdd5ff041971e62d:/src/modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index 84cb36d..f3a8f53 100644
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -608,7 +608,9 @@ svccmd_expand_alias(struct svccmd *cmd, struct userNode *user, unsigned int old_
         if (arg[1] == '$') {
             new_argv[new_argc++] = arg + 1;
         } else if (isdigit(arg[1])) {
-            unsigned int lbound, ubound, jj;
+            unsigned int lbound = 0;
+            unsigned int ubound = 0;
+            unsigned int jj = 0;
             char *end_num;
 
             lbound = strtoul(arg+1, &end_num, 10);
@@ -691,6 +693,7 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo
     struct svccmd *cmd;
     unsigned int cmd_arg, perms, flags, options, result;
     char channel_name[CHANNELLEN+1];
+    char *new_argv[MAXNUMPARAMS]; /* for aliases */
 
     options = (server_qualified ? SVCCMD_QUALIFIED : 0) | SVCCMD_DEBIT | SVCCMD_NOISY;
     /* Find the command argument. */
@@ -754,7 +757,6 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo
 
     /* Expand the alias arguments, if there are any. */
     if (cmd->alias.used) {
-        char *new_argv[MAXNUMPARAMS];
         int res;
 
         res = svccmd_expand_alias(cmd, user, argc, argv, new_argv);
@@ -808,8 +810,11 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo
         safestrncpy(channel_name, channel->name, sizeof(channel_name));
     else
         channel_name[0] = 0;
-    if (!(result = cmd->command->func(user, channel, argc, argv, cmd)))
+
+    /* Call the function here */
+    if (!(result = cmd->command->func(user, channel, argc, argv, cmd))) 
         return 0;
+
     if (!(flags & MODCMD_NO_LOG)) {
         enum log_severity slvl;
         if (result & CMD_LOG_OVERRIDE)
@@ -950,7 +955,7 @@ svccmd_send_help(struct userNode *user, struct service *service, const char *top
 }
 
 static int
-svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *channel, const char *text, int server_qualified) {
+svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *channel, const char *text, int server_qualified, int chanmsg) {
     unsigned int argc;
     char *argv[MAXNUMPARAMS];
     char tmpline[MAXLEN];
@@ -958,6 +963,9 @@ svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *c
     if (!*text)
         return 0;
     if (service->privileged) {
+        /* Silently return if the message is a channel message (trigger) */
+        if (chanmsg && (!IsOper(user) || !user->handle_info || HANDLE_FLAGGED(user->handle_info, OPER_SUSPENDED)))
+            return 0;
         if (!IsOper(user)) {
             send_message(user, service->bot, "MSG_SERVICE_PRIVILEGED", service->bot->nick);
             return 0;
@@ -1035,7 +1043,7 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, in
 
     if (service->msg_hook && service->msg_hook(user, bot, text, server_qualified))
         return;
-    svccmd_invoke(user, service, NULL, text, server_qualified);
+    svccmd_invoke(user, service, NULL, text, server_qualified, 0);
 }
 
 void
@@ -1043,7 +1051,7 @@ modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, s
     struct service *service;
     if (!(service = dict_find(services, bot->nick, NULL)))
         return;
-    svccmd_invoke(user, service, chan, text, 0);
+    svccmd_invoke(user, service, chan, text, 0, 1);
     (void)is_notice;
 }
 
@@ -1128,9 +1136,8 @@ check_alias_args(char *argv[], unsigned int argc) {
             continue;
         } else if (isdigit(argv[arg][1])) {
             char *end_num;
-            unsigned long tmp;
 
-            tmp = strtoul(argv[arg]+1, &end_num, 10);
+            strtoul(argv[arg]+1, &end_num, 10);
             switch (end_num[0]) {
             case 0:
                 continue;
@@ -1407,7 +1414,7 @@ static MODCMD_FUNC(cmd_timecmd) {
 
     unsplit_string(argv+1, argc-1, cmd_text);
     gettimeofday(&start, NULL);
-    svccmd_invoke(user, cmd->parent, channel, cmd_text, 0);
+    svccmd_invoke(user, cmd->parent, channel, cmd_text, 0, 0);
     gettimeofday(&stop, NULL);
     stop.tv_sec -= start.tv_sec;
     stop.tv_usec -= start.tv_usec;
@@ -2055,8 +2062,8 @@ static MODCMD_FUNC(cmd_credits) {
     send_message_type(4, user, cmd->parent->bot, "OSI Certified is a certification mark of the Open Source Initiative.");
     send_message_type(4, user, cmd->parent->bot, "$b$b");
     send_message_type(4, user, cmd->parent->bot, "The srvx 1.3.x Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.");
-    send_message_type(4, user, cmd->parent->bot, "The X3 Development Team includes Alex Schumann, Reed Loden, Neil Spierling.");
-    send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at http://evilnet.sourceforge.net or in #evilnet on irc.afternet.org.");
+    send_message_type(4, user, cmd->parent->bot, "The X3 Development Team includes Alex Schumann, Reed Loden, Neil Spierling, Matthew Beeching.");
+    send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at https://github.com/evilnet/x3/ or in #evilnet on irc.afternet.org.");
     send_message_type(4, user, cmd->parent->bot, "$b$b");
     send_message_type(4, user, cmd->parent->bot, "Thanks goes to ThiefMaster, Joe Hansche (joeatrr), Martijn Smit (wasted), and to any other people who have contributed to X3.");
     send_message_type(4, user, cmd->parent->bot, "This program is free software; see COPYING in the distribution files.");