BUILD : 1.7.5 (371) BUGS : 175? NOTES : Fixed some ircd protcol mistakes, clean up clear modes, also a patch form DrStein

git-svn-id: svn://svn.anope.org/anope/trunk@371 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@241 5417fbe8-f217-4b02-8779-1006273d7864

14 files changed, 1022 insertions, 1038 deletions

diff --git a/src/bahamut.c b/src/bahamut.c
index c8adb33f1..032268aae 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -75,8 +75,8 @@ IRCDVar ircd[] = {
      1,                         /* svshold              */
      1,                         /* time stamp on mode   */
      1,                         /* NICKIP               */
-     0,                         /* UMODE                */
      0,                         /* O:LINE               */
+     1,                         /* UMODE               */
      0,                         /* VHOST ON NICK        */
      0,                         /* Change RealName      */
      0,                         /* ChanServ extra       */
@@ -161,7 +161,7 @@ void anope_set_umode(User * user, int ac, char **av)
             break;
         case 'a':
             if (add && !is_services_admin(user)) {
-                send_cmd(ServerName, "SVSMODE %s -a", user->nick);
+                common_svsmode(user, "-a", NULL);
                 user->mode &= ~UMODE_a;
             }
             break;
@@ -192,7 +192,7 @@ void anope_set_umode(User * user, int ac, char **av)
             break;
         case 'r':
             if (add && !nick_identified(user)) {
-                send_cmd(ServerName, "SVSMODE %s -r", user->nick);
+                common_svsmode(user, "-r", NULL);
                 user->mode &= ~UMODE_r;
             }
             break;
diff --git a/src/chanserv.c b/src/chanserv.c
index 0be9cb809..731e5262c 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -5726,16 +5726,40 @@ static int do_clear(User * u)
         char *argv[2];
 
         if (c->mode) {
-            /* Clear modes */
+            /* Clear modes the bulk of the modes */
             anope_cmd_mode(s_ChanServ, c->name, "%s %s",
-                           ircd->modestoremove, c->key ? c->key : "");
+                           ircd->modestoremove);
             argv[0] = sstrdup(ircd->modestoremove);
-            argv[1] = c->key ? c->key : NULL;
-            chan_set_modes(s_OperServ, c, c->key ? 2 : 1, argv, 0);
+            chan_set_modes(s_ChanServ, c, 1, argv, 0);
             free(argv[0]);
-            check_modes(c);
+
+            /* to prevent the internals from complaining send -k, -L, -f by themselves if we need
+               to send them - TSL */
+            if (c->key) {
+                anope_cmd_mode(s_ChanServ, c->name, "-k %s", c->key);
+                argv[0] = sstrdup("-k");
+                argv[1] = c->key;
+                chan_set_modes(s_ChanServ, c, 2, argv, 0);
+                free(argv[0]);
+            }
+            if (ircd->Lmode && c->redirect) {
+                anope_cmd_mode(s_ChanServ, c->name, "-L %s", c->redirect);
+                argv[0] = sstrdup("-L");
+                argv[1] = c->redirect;
+                chan_set_modes(s_ChanServ, c, 2, argv, 0);
+                free(argv[0]);
+            }
+            if (ircd->fmode && c->flood) {
+                anope_cmd_mode(s_ChanServ, c->name, "-f %s", c->flood);
+                argv[0] = sstrdup("-f");
+                argv[1] = c->flood;
+                chan_set_modes(s_ChanServ, c, 2, argv, 0);
+                free(argv[0]);
+            }
         }
 
+
+
         /* TODO: decide if the above implementation is better than this one. */
 
         if (0) {
@@ -6152,7 +6176,7 @@ static int do_status(User * u)
     chan = strtok(NULL, " ");
     nick = strtok(NULL, " ");
     if (!nick || strtok(NULL, " ")) {
-        notice_user(s_ChanServ, u, "STATUS ERROR Syntax error");
+        notice_lang(s_ChanServ, u, CHAN_STATUS_SYNTAX);
         return MOD_CONT;
     }
     if (!(ci = cs_findchan(chan))) {
@@ -6162,18 +6186,15 @@ static int do_status(User * u)
         ci = cs_findchan(chan);
     }
     if (!ci) {
-        notice_user(s_ChanServ, u,
-                    "STATUS ERROR Channel %s not registered", chan);
+        notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, chan);
     } else if (ci->flags & CI_VERBOTEN) {
-        notice_user(s_ChanServ, u, "STATUS ERROR Channel %s forbidden",
-                    chan);
+        notice_lang(s_ChanServ, u, CHAN_STATUS_FORBIDDEN, chan);
         return MOD_CONT;
     } else if ((u2 = finduser(nick)) != NULL) {
-        notice_user(s_ChanServ, u, "STATUS %s %s %d", chan, nick,
+        notice_lang(s_ChanServ, u, CHAN_STATUS_INFO, chan, nick,
                     get_access(u2, ci));
     } else {                    /* !u2 */
-        notice_user(s_ChanServ, u, "STATUS ERROR Nick %s not online",
-                    nick);
+        notice_lang(s_ChanServ, u, CHAN_STATUS_NOTONLINE, nick);
     }
     return MOD_CONT;
 }
diff --git a/src/dreamforge.c b/src/dreamforge.c
index 6cd83bd3f..91c23239b 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -73,8 +73,8 @@ IRCDVar ircd[] = {
      0,                         /* svshold              */
      1,                         /* time stamp on mode   */
      0,                         /* NICKIP               */
-     0,                         /* UMODE                */
      0,                         /* O:LINE               */
+     1,                         /* UMODE               */
      0,                         /* VHOST ON NICK        */
      0,                         /* Change RealName      */
      0,                         /* ChanServ extra       */
@@ -183,7 +183,7 @@ void anope_set_umode(User * user, int ac, char **av)
             break;
         case 'r':
             if (add && !nick_identified(user)) {
-                send_cmd(ServerName, "SVSMODE %s -r", user->nick);
+                common_svsmode(user, "-r", NULL);
                 user->mode &= ~UMODE_r;
             }
             break;
diff --git a/src/hybrid.c b/src/hybrid.c
index 7947173e2..9c2deafe2 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -73,8 +73,8 @@ IRCDVar ircd[] = {
      0,                         /* svshold              */
      0,                         /* time stamp on mode   */
      0,                         /* NICKIP               */
-     0,                         /* UMODE                */
      0,                         /* O:LINE               */
+     0,                         /* UMODE               */
      0,                         /* VHOST ON NICK        */
      0,                         /* Change RealName      */
      0,                         /* ChanServ extra               */
@@ -183,409 +183,391 @@ void anope_set_umode(User * user, int ac, char **av)
                 opcnt--;
             }
             break;
-        case 'r':
-            if (add && !nick_identified(user)) {
-                send_cmd(ServerName, "SVSMODE %s -r", user->nick);
-                user->mode &= ~UMODE_r;
-            }
-            break;
-
         }
     }
-}
-
-unsigned long umodes[128] = {
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused, Unused, Horzontal Tab */
-    0, 0, 0,                    /* Line Feed, Unused, Unused */
-    0, 0, 0,                    /* Carriage Return, Unused, Unused */
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused */
-    0, 0, 0,                    /* Unused, Unused, Space */
-    0, 0, 0,                    /* ! " #  */
-    0, 0, 0,                    /* $ % &  */
-    0, 0, 0,                    /* ! ( )  */
-    0, 0, 0,                    /* * + ,  */
-    0, 0, 0,                    /* - . /  */
-    0, 0,                       /* 0 1 */
-    0, 0,                       /* 2 3 */
-    0, 0,                       /* 4 5 */
-    0, 0,                       /* 6 7 */
-    0, 0,                       /* 8 9 */
-    0, 0,                       /* : ; */
-    0, 0, 0,                    /* < = > */
-    0, 0,                       /* ? @ */
-    0, 0, 0,                    /* A B C */
-    0, 0, 0,                    /* D E F */
-    0, 0, 0,                    /* G H I */
-    0, 0, 0,                    /* J K L */
-    0, 0, 0,                    /* M N O */
-    0, 0, 0,                    /* P Q R */
-    0, 0, 0,                    /* S T U */
-    0, 0, 0,                    /* V W X */
-    0,                          /* Y */
-    0,                          /* Z */
-    0, 0, 0,                    /* [ \ ] */
-    0, 0, 0,                    /* ^ _ ` */
-    UMODE_a, UMODE_b, UMODE_c,  /* a b c */
-    UMODE_d, 0, UMODE_f,        /* d e f */
-    UMODE_g, 0, UMODE_i,        /* g h i */
-    0, UMODE_k, UMODE_l,        /* j k l */
-    0, UMODE_n, UMODE_o,        /* m n o */
-    0, 0, UMODE_r,              /* p q r */
-    UMODE_s, 0, UMODE_u,        /* s t u */
-    0, UMODE_w, UMODE_x,        /* v w x */
-    UMODE_y,                    /* y */
-    UMODE_z,                    /* z */
-    0, 0, 0,                    /* { | } */
-    0, 0                        /* ~ ‚ */
-};
-
-
-char csmodes[128] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
-    0,
-    'a',                        /* (33) !  */
-    0, 0, 0,
-    'h',
-    0, 0, 0, 0,
-    0,
-
-    'v', 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
-    'o', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-CMMode cmmodes[128] = {
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL},     /* BCD */
-    {NULL}, {NULL}, {NULL},     /* EFG */
-    {NULL},                     /* H */
-    {add_invite, del_invite},
-    {NULL},                     /* J */
-    {NULL}, {NULL}, {NULL},     /* KLM */
-    {NULL}, {NULL}, {NULL},     /* NOP */
-    {NULL}, {NULL}, {NULL},     /* QRS */
-    {NULL}, {NULL}, {NULL},     /* TUV */
-    {NULL}, {NULL}, {NULL},     /* WXY */
-    {NULL},                     /* Z */
-    {NULL}, {NULL},             /* (char 91 - 92) */
-    {NULL}, {NULL}, {NULL},     /* (char 93 - 95) */
-    {NULL},                     /* ` (char 96) */
-    {NULL},                     /* a (char 97) */
-    {add_ban, del_ban},
-    {NULL},
-    {NULL},
-    {add_exception, del_exception},
-    {NULL},
-    {NULL},
-    {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
-    {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}
-};
-
-
-CBMode cbmodes[128] = {
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0},
-    {0},                        /* A */
-    {0},                        /* B */
-    {0},                        /* C */
-    {0},                        /* D */
-    {0},                        /* E */
-    {0},                        /* F */
-    {0},                        /* G */
-    {0},                        /* H */
-    {0},                        /* I */
-    {0},                        /* J */
-    {0},                        /* K */
-    {0},                        /* L */
-    {0},                        /* M */
-    {0},                        /* N */
-    {0},                        /* O */
-    {0},                        /* P */
-    {0},                        /* Q */
-    {0},
-    {0},                        /* S */
-    {0},                        /* T */
-    {0},                        /* U */
-    {0},                        /* V */
-    {0},                        /* W */
-    {0},                        /* X */
-    {0},                        /* Y */
-    {0},                        /* Z */
-    {0}, {0}, {0}, {0}, {0}, {0},
-    {CMODE_a, 0, NULL, NULL},
-    {0},                        /* b */
-    {0},                        /* c */
-    {0},                        /* d */
-    {0},                        /* e */
-    {0},                        /* f */
-    {0},                        /* g */
-    {0},                        /* h */
-    {CMODE_i, 0, NULL, NULL},
-    {0},                        /* j */
-    {CMODE_k, 0, set_key, cs_set_key},
-    {CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
-    {CMODE_m, 0, NULL, NULL},
-    {CMODE_n, 0, NULL, NULL},
-    {0},                        /* o */
-    {CMODE_p, 0, NULL, NULL},
-    {0},                        /* q */
-    {0},
-    {CMODE_s, 0, NULL, NULL},
-    {CMODE_t, 0, NULL, NULL},
-    {0},
-    {0},                        /* v */
-    {0},                        /* w */
-    {0},                        /* x */
-    {0},                        /* y */
-    {0},                        /* z */
-    {0}, {0}, {0}, {0}
-};
-
-CBModeInfo cbmodeinfos[] = {
-    {'a', CMODE_a, 0, NULL, NULL},
-    {'i', CMODE_i, 0, NULL, NULL},
-    {'k', CMODE_k, 0, get_key, cs_get_key},
-    {'l', CMODE_l, CBM_MINUS_NO_ARG, get_limit, cs_get_limit},
-    {'m', CMODE_m, 0, NULL, NULL},
-    {'n', CMODE_n, 0, NULL, NULL},
-    {'p', CMODE_p, 0, NULL, NULL},
-    {'s', CMODE_s, 0, NULL, NULL},
-    {'t', CMODE_t, 0, NULL, NULL},
-    {0}
-};
 
+    unsigned long umodes[128] = {
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused, Unused, Horzontal Tab */
+        0, 0, 0,                /* Line Feed, Unused, Unused */
+        0, 0, 0,                /* Carriage Return, Unused, Unused */
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused */
+        0, 0, 0,                /* Unused, Unused, Space */
+        0, 0, 0,                /* ! " #  */
+        0, 0, 0,                /* $ % &  */
+        0, 0, 0,                /* ! ( )  */
+        0, 0, 0,                /* * + ,  */
+        0, 0, 0,                /* - . /  */
+        0, 0,                   /* 0 1 */
+        0, 0,                   /* 2 3 */
+        0, 0,                   /* 4 5 */
+        0, 0,                   /* 6 7 */
+        0, 0,                   /* 8 9 */
+        0, 0,                   /* : ; */
+        0, 0, 0,                /* < = > */
+        0, 0,                   /* ? @ */
+        0, 0, 0,                /* A B C */
+        0, 0, 0,                /* D E F */
+        0, 0, 0,                /* G H I */
+        0, 0, 0,                /* J K L */
+        0, 0, 0,                /* M N O */
+        0, 0, 0,                /* P Q R */
+        0, 0, 0,                /* S T U */
+        0, 0, 0,                /* V W X */
+        0,                      /* Y */
+        0,                      /* Z */
+        0, 0, 0,                /* [ \ ] */
+        0, 0, 0,                /* ^ _ ` */
+        UMODE_a, UMODE_b, UMODE_c,      /* a b c */
+        UMODE_d, 0, UMODE_f,    /* d e f */
+        UMODE_g, 0, UMODE_i,    /* g h i */
+        0, UMODE_k, UMODE_l,    /* j k l */
+        0, UMODE_n, UMODE_o,    /* m n o */
+        0, 0, UMODE_r,          /* p q r */
+        UMODE_s, 0, UMODE_u,    /* s t u */
+        0, UMODE_w, UMODE_x,    /* v w x */
+        UMODE_y,                /* y */
+        UMODE_z,                /* z */
+        0, 0, 0,                /* { | } */
+        0, 0                    /* ~ ‚ */
+    };
+
+
+    char csmodes[128] = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+        0,
+        'a',                    /* (33) !  */
+        0, 0, 0,
+        'h',
+        0, 0, 0, 0,
+        0,
+
+        'v', 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+        'o', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+
+    CMMode cmmodes[128] = {
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL}, /* BCD */
+        {NULL}, {NULL}, {NULL}, /* EFG */
+        {NULL},                 /* H */
+        {add_invite, del_invite},
+        {NULL},                 /* J */
+        {NULL}, {NULL}, {NULL}, /* KLM */
+        {NULL}, {NULL}, {NULL}, /* NOP */
+        {NULL}, {NULL}, {NULL}, /* QRS */
+        {NULL}, {NULL}, {NULL}, /* TUV */
+        {NULL}, {NULL}, {NULL}, /* WXY */
+        {NULL},                 /* Z */
+        {NULL}, {NULL},         /* (char 91 - 92) */
+        {NULL}, {NULL}, {NULL}, /* (char 93 - 95) */
+        {NULL},                 /* ` (char 96) */
+        {NULL},                 /* a (char 97) */
+        {add_ban, del_ban},
+        {NULL},
+        {NULL},
+        {add_exception, del_exception},
+        {NULL},
+        {NULL},
+        {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
+        {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}
+    };
+
+
+    CBMode cbmodes[128] = {
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0},
+        {0},                    /* A */
+        {0},                    /* B */
+        {0},                    /* C */
+        {0},                    /* D */
+        {0},                    /* E */
+        {0},                    /* F */
+        {0},                    /* G */
+        {0},                    /* H */
+        {0},                    /* I */
+        {0},                    /* J */
+        {0},                    /* K */
+        {0},                    /* L */
+        {0},                    /* M */
+        {0},                    /* N */
+        {0},                    /* O */
+        {0},                    /* P */
+        {0},                    /* Q */
+        {0},
+        {0},                    /* S */
+        {0},                    /* T */
+        {0},                    /* U */
+        {0},                    /* V */
+        {0},                    /* W */
+        {0},                    /* X */
+        {0},                    /* Y */
+        {0},                    /* Z */
+        {0}, {0}, {0}, {0}, {0}, {0},
+        {CMODE_a, 0, NULL, NULL},
+        {0},                    /* b */
+        {0},                    /* c */
+        {0},                    /* d */
+        {0},                    /* e */
+        {0},                    /* f */
+        {0},                    /* g */
+        {0},                    /* h */
+        {CMODE_i, 0, NULL, NULL},
+        {0},                    /* j */
+        {CMODE_k, 0, set_key, cs_set_key},
+        {CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
+        {CMODE_m, 0, NULL, NULL},
+        {CMODE_n, 0, NULL, NULL},
+        {0},                    /* o */
+        {CMODE_p, 0, NULL, NULL},
+        {0},                    /* q */
+        {0},
+        {CMODE_s, 0, NULL, NULL},
+        {CMODE_t, 0, NULL, NULL},
+        {0},
+        {0},                    /* v */
+        {0},                    /* w */
+        {0},                    /* x */
+        {0},                    /* y */
+        {0},                    /* z */
+        {0}, {0}, {0}, {0}
+    };
+
+    CBModeInfo cbmodeinfos[] = {
+        {'a', CMODE_a, 0, NULL, NULL},
+        {'i', CMODE_i, 0, NULL, NULL},
+        {'k', CMODE_k, 0, get_key, cs_get_key},
+        {'l', CMODE_l, CBM_MINUS_NO_ARG, get_limit, cs_get_limit},
+        {'m', CMODE_m, 0, NULL, NULL},
+        {'n', CMODE_n, 0, NULL, NULL},
+        {'p', CMODE_p, 0, NULL, NULL},
+        {'s', CMODE_s, 0, NULL, NULL},
+        {'t', CMODE_t, 0, NULL, NULL},
+        {0}
+    };
+
+
+    CUMode cumodes[128] = {
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+        {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+
+        {0},
+
+        {0},                    /* a */
+        {0},                    /* b */
+        {0},                    /* c */
+        {0},                    /* d */
+        {0},                    /* e */
+        {0},                    /* f */
+        {0},                    /* g */
+        {CUS_HALFOP, 0, check_valid_op},
+        {0},                    /* i */
+        {0},                    /* j */
+        {0},                    /* k */
+        {0},                    /* l */
+        {0},                    /* m */
+        {0},                    /* n */
+        {CUS_OP, CUF_PROTECT_BOTSERV, check_valid_op},
+        {0},                    /* p */
+        {0},                    /* q */
+        {0},                    /* r */
+        {0},                    /* s */
+        {0},                    /* t */
+        {0},                    /* u */
+        {CUS_VOICE, 0, NULL},
+        {0},                    /* w */
+        {0},                    /* x */
+        {0},                    /* y */
+        {0},                    /* z */
+        {0}, {0}, {0}, {0}, {0}
+    };
+
+
+
+    void anope_cmd_notice(char *source, char *dest, const char *fmt, ...) {
+        va_list args;
+        char buf[BUFSIZE];
+        *buf = '\0';
+
+        if (fmt) {
+            va_start(args, fmt);
+            vsnprintf(buf, BUFSIZE - 1, fmt, args);
+            va_end(args);
+        }
+        if (!buf) {
+            return;
+        }
 
-CUMode cumodes[128] = {
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-    {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
-
-    {0},
-
-    {0},                        /* a */
-    {0},                        /* b */
-    {0},                        /* c */
-    {0},                        /* d */
-    {0},                        /* e */
-    {0},                        /* f */
-    {0},                        /* g */
-    {CUS_HALFOP, 0, check_valid_op},
-    {0},                        /* i */
-    {0},                        /* j */
-    {0},                        /* k */
-    {0},                        /* l */
-    {0},                        /* m */
-    {0},                        /* n */
-    {CUS_OP, CUF_PROTECT_BOTSERV, check_valid_op},
-    {0},                        /* p */
-    {0},                        /* q */
-    {0},                        /* r */
-    {0},                        /* s */
-    {0},                        /* t */
-    {0},                        /* u */
-    {CUS_VOICE, 0, NULL},
-    {0},                        /* w */
-    {0},                        /* x */
-    {0},                        /* y */
-    {0},                        /* z */
-    {0}, {0}, {0}, {0}, {0}
-};
+        if (UsePrivmsg) {
+            anope_cmd_privmsg2(source, dest, buf);
+        } else {
+            send_cmd(source, "NOTICE %s :%s", dest, buf);
+        }
+    }
 
+    void anope_cmd_notice2(char *source, char *dest, char *msg) {
+        send_cmd(source, "NOTICE %s :%s", dest, msg);
+    }
 
+    void anope_cmd_privmsg(char *source, char *dest, const char *fmt, ...) {
+        va_list args;
+        char buf[BUFSIZE];
+        *buf = '\0';
 
-void anope_cmd_notice(char *source, char *dest, const char *fmt, ...)
-{
-    va_list args;
-    char buf[BUFSIZE];
-    *buf = '\0';
+        if (fmt) {
+            va_start(args, fmt);
+            vsnprintf(buf, BUFSIZE - 1, fmt, args);
+            va_end(args);
+        }
+        if (!buf) {
+            return;
+        }
 
-    if (fmt) {
-        va_start(args, fmt);
-        vsnprintf(buf, BUFSIZE - 1, fmt, args);
-        va_end(args);
-    }
-    if (!buf) {
-        return;
+        send_cmd(source, "PRIVMSG %s :%s", dest, buf);
     }
 
-    if (UsePrivmsg) {
-        anope_cmd_privmsg2(source, dest, buf);
-    } else {
-        send_cmd(source, "NOTICE %s :%s", dest, buf);
+    void anope_cmd_privmsg2(char *source, char *dest, char *msg) {
+        send_cmd(source, "PRIVMSG %s :%s", dest, msg);
     }
-}
 
-void anope_cmd_notice2(char *source, char *dest, char *msg)
-{
-    send_cmd(source, "NOTICE %s :%s", dest, msg);
-}
-
-void anope_cmd_privmsg(char *source, char *dest, const char *fmt, ...)
-{
-    va_list args;
-    char buf[BUFSIZE];
-    *buf = '\0';
-
-    if (fmt) {
-        va_start(args, fmt);
-        vsnprintf(buf, BUFSIZE - 1, fmt, args);
-        va_end(args);
-    }
-    if (!buf) {
-        return;
+    void anope_cmd_serv_notice(char *source, char *dest, char *msg) {
+        send_cmd(source, "NOTICE $$%s :%s", dest, msg);
     }
 
-    send_cmd(source, "PRIVMSG %s :%s", dest, buf);
-}
+    void anope_cmd_serv_privmsg(char *source, char *dest, char *msg) {
+        send_cmd(source, "PRIVMSG $$%s :%s", dest, msg);
+    }
 
-void anope_cmd_privmsg2(char *source, char *dest, char *msg)
-{
-    send_cmd(source, "PRIVMSG %s :%s", dest, msg);
-}
 
-void anope_cmd_serv_notice(char *source, char *dest, char *msg)
-{
-    send_cmd(source, "NOTICE $$%s :%s", dest, msg);
-}
+    void anope_cmd_global(char *source, const char *fmt, ...) {
+        va_list args;
+        char buf[BUFSIZE];
+        *buf = '\0';
 
-void anope_cmd_serv_privmsg(char *source, char *dest, char *msg)
-{
-    send_cmd(source, "PRIVMSG $$%s :%s", dest, msg);
-}
+        if (fmt) {
+            va_start(args, fmt);
+            vsnprintf(buf, BUFSIZE - 1, fmt, args);
+            va_end(args);
+        }
+        if (!buf) {
+            return;
+        }
 
+        send_cmd(source ? source : ServerName, "OPERWALL :%s", buf);
+    }
 
-void anope_cmd_global(char *source, const char *fmt, ...)
-{
-    va_list args;
-    char buf[BUFSIZE];
-    *buf = '\0';
 
-    if (fmt) {
-        va_start(args, fmt);
-        vsnprintf(buf, BUFSIZE - 1, fmt, args);
-        va_end(args);
+    int anope_event_sjoin(char *source, int ac, char **av) {
+        do_sjoin(source, ac, av);
+        return MOD_CONT;
     }
-    if (!buf) {
-        return;
+
+    int anope_event_nick(char *source, int ac, char **av) {
+        if (ac != 2) {
+            User *user = do_nick(source, av[0], av[4], av[5], av[6], av[7],
+                                 strtoul(av[2], NULL, 10), 0, 0, NULL,
+                                 NULL);
+            if (user)
+                anope_set_umode(user, 1, &av[3]);
+        } else {
+            do_nick(source, av[0], NULL, NULL, NULL, NULL,
+                    strtoul(av[1], NULL, 10), 0, 0, NULL, NULL);
+        }
+        return MOD_CONT;
     }
 
-    send_cmd(source ? source : ServerName, "OPERWALL :%s", buf);
-}
+    int anope_event_topic(char *source, int ac, char **av) {
+        if (ac == 4) {
+            do_topic(source, ac, av);
+        } else {
+            Channel *c = findchan(av[0]);
+            time_t topic_time = time(NULL);
+
+            if (!c) {
+                alog("channel: TOPIC %s for nonexistent channel %s",
+                     merge_args(ac - 1, av + 1), av[0]);
+                return MOD_CONT;
+            }
 
+            if (check_topiclock(c, topic_time))
+                return MOD_CONT;
 
-int anope_event_sjoin(char *source, int ac, char **av)
-{
-    do_sjoin(source, ac, av);
-    return MOD_CONT;
-}
+            if (c->topic) {
+                free(c->topic);
+                c->topic = NULL;
+            }
+            if (ac > 1 && *av[1])
+                c->topic = sstrdup(av[1]);
 
-int anope_event_nick(char *source, int ac, char **av)
-{
-    if (ac != 2) {
-        User *user = do_nick(source, av[0], av[4], av[5], av[6], av[7],
-                             strtoul(av[2], NULL, 10), 0, 0, NULL, NULL);
-        if (user)
-            anope_set_umode(user, 1, &av[3]);
-    } else {
-        do_nick(source, av[0], NULL, NULL, NULL, NULL,
-                strtoul(av[1], NULL, 10), 0, 0, NULL, NULL);
-    }
-    return MOD_CONT;
-}
+            strscpy(c->topic_setter, source, sizeof(c->topic_setter));
+            c->topic_time = topic_time;
 
-int anope_event_topic(char *source, int ac, char **av)
-{
-    if (ac == 4) {
-        do_topic(source, ac, av);
-    } else {
-        Channel *c = findchan(av[0]);
-        time_t topic_time = time(NULL);
-
-        if (!c) {
-            alog("channel: TOPIC %s for nonexistent channel %s",
-                 merge_args(ac - 1, av + 1), av[0]);
-            return MOD_CONT;
+            record_topic(av[0]);
         }
+        return MOD_CONT;
+    }
 
-        if (check_topiclock(c, topic_time))
+    int anope_event_436(char *source, int ac, char **av) {
+        if (ac < 1)
             return MOD_CONT;
 
-        if (c->topic) {
-            free(c->topic);
-            c->topic = NULL;
-        }
-        if (ac > 1 && *av[1])
-            c->topic = sstrdup(av[1]);
-
-        strscpy(c->topic_setter, source, sizeof(c->topic_setter));
-        c->topic_time = topic_time;
-
-        record_topic(av[0]);
-    }
-    return MOD_CONT;
-}
-
-int anope_event_436(char *source, int ac, char **av)
-{
-    if (ac < 1)
+        m_nickcoll(av[0]);
         return MOD_CONT;
-
-    m_nickcoll(av[0]);
-    return MOD_CONT;
-}
+    }
 
 
 /* *INDENT-OFF* */
@@ -637,69 +619,56 @@ void moduleAddIRCDMsgs(void) {
 /* *INDENT-ON* */
 
 
-void anope_cmd_sqline(char *mask, char *reason)
-{
+    void anope_cmd_sqline(char *mask, char *reason) {
 
-}
-void anope_cmd_unsgline(char *mask)
-{
+    }
+    void anope_cmd_unsgline(char *mask) {
 /* Does not support */
-}
+    }
 
-void anope_cmd_unszl