Changeset 754 for branches/ithildin-1.1

Timestamp:

06/24/06 19:02:03 (6 years ago)

Author:

wd

Message:

Re-add missing support for bahamut's "TS" portion of SVSMODE.

File:

• branches/ithildin-1.1/modules/ircd/commands/svsmode.c (modified) (2 diffs)

branches/ithildin-1.1/modules/ircd/commands/svsmode.c

@@ -49 +49 @@
     channel_t *chan;
     client_t *cp;
+    char **myargv;
+    int myargc;
 
     if (check_channame(argv[1]) && (chan = find_channel(argv[1])) != NULL) {
@@ -59 +61 @@
          * and treat everything else as a real client mode. */
 
-        if (argc == 4 && !strcmp(argv[2], "+d")) {
-            /* this is so dumb */
-            SVSID(cp) = str_conv_int(argv[3], 0);
-        } else if (MYCLIENT(cp))
+        /* They may send a ts along first.  We must skip this. */
+        if (isdigit(*argv[2])) {
+            myargv = argv + 3; /* skip to argv[3] */
+            myargc = argc - 3;
+        } else {
+            myargv = argv + 2;
+            myargc = argc - 2;
+        }
+
+        if (myargc == 2 && (!strcmp(myargv[0], "+d") ||
+                    !strcmp(myargv[0], "+T"))) {
+            if (!strcmp(argv[0], "+d"))
+                /* this is so dumb */
+                SVSID(cp) = str_conv_int(myargv[1], 0);
+
+            sendto_serv_butone(sptr, cli, srv, cp->nick, "SVSMODE",
+                    "%s %s", myargv[0], myargv[1]);
+            return;
+        }
+        if (MYCLIENT(cp))
             /* Is this our client?  If so do the usermode thing.  Otherwise
              * just pass along the command, we expect a MODE back when it is
              * processed by the user's server. */
-            user_mode(cp, cp, argc - 3, argv + 3, true);
+            user_mode(NULL, cp, myargc, myargv, true);
 
-        /* XXX: For modes with arguments (none exist - yet) we do not
-         * support the idea well.  What we really need to do and don't is to
-         * tack on all of argv.. broken. */
-        if (argc > 3)
-            sendto_serv_butone(sptr, cli, srv, cp->nick, "SVSMODE",
-                    "%s %s", argv[2], argv[3]);
-        else
-            sendto_serv_butone(sptr, cli, srv, cp->nick, "SVSMODE",
-                    "%s", argv[2]);
+        sendto_serv_butone(sptr, cli, srv, cp->nick, "SVSMODE", "%s",
+                myargv[0]);
     }
 }