Remove some older protocol modules, mark a number of others obsolete. Some may be rescued later on.

Fix problems with anopesmtp and db-merger tool, mark epona2anope obsolete.


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

1 files changed, 0 insertions, 1733 deletions

diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
deleted file mode 100644
index b235e545e..000000000
--- a/src/protocol/ultimate2.c
+++ /dev/null
@@ -1,1733 +0,0 @@
-/* Ultimate IRCD 2 functions
- *
- * (C) 2003-2008 Anope Team
- * Contact us at info@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- *
- */
-
-#include "services.h"
-#include "pseudo.h"
-#include "ultimate2.h"
-
-IRCDVar myIrcd[] = {
-    {"UltimateIRCd 2.8.*",      /* ircd name */
-     "+S",                      /* nickserv mode */
-     "+S",                      /* chanserv mode */
-     "+S",                      /* memoserv mode */
-     "+oS",                     /* hostserv mode */
-     "+iS",                     /* operserv mode */
-     "+S",                      /* botserv mode  */
-     "+Sh",                     /* helpserv mode */
-     "+iS",                     /* Dev/Null mode */
-     "+iS",                     /* Global mode   */
-     "+oS",                     /* nickserv alias mode */
-     "+oS",                     /* chanserv alias mode */
-     "+oS",                     /* memoserv alias mode */
-     "+ioS",                    /* hostserv alias mode */
-     "+ioS",                    /* operserv alias mode */
-     "+oS",                     /* botserv alias mode  */
-     "+oS",                     /* helpserv alias mode */
-     "+iS",                     /* Dev/Null alias mode */
-     "+ioS",                    /* Global alias mode   */
-     "+pS",                     /* Used by BotServ Bots */
-     3,                         /* Chan Max Symbols     */
-     "-ilmnpstxAIKORS",         /* Modes to Remove */
-     "+ao",                     /* Channel Umode used by Botserv bots */
-     1,                         /* SVSNICK */
-     1,                         /* Vhost  */
-     0,                         /* Has Owner */
-     NULL,                      /* Mode to set for an owner */
-     NULL,                      /* Mode to unset for an owner */
-     NULL,                      /* Mode to set for chan admin */
-     NULL,                      /* Mode to remove for chan admin */
-     "+rd",                     /* Mode On Reg          */
-     NULL,                      /* Mode on ID for Roots */
-     NULL,                      /* Mode on ID for Admins */
-     NULL,                      /* Mode on ID for Opers */
-     "-r+d",                    /* Mode on UnReg        */
-     "-r+d",                    /* Mode on Nick Change  */
-     0,                         /* Supports SGlines     */
-     1,                         /* Supports SQlines     */
-     0,                         /* Supports SZlines     */
-     1,                         /* Supports Halfop +h   */
-     3,                         /* Number of server args */
-     0,                         /* Join 2 Set           */
-     0,                         /* Join 2 Message       */
-     1,                         /* Has exceptions +e    */
-     0,                         /* TS Topic Forward     */
-     0,                         /* TS Topci Backward    */
-     UMODE_p,                   /* Protected Umode      */
-     0,                         /* Has Admin            */
-     0,                         /* Chan SQlines         */
-     0,                         /* Quit on Kill         */
-     0,                         /* SVSMODE unban        */
-     0,                         /* Has Protect          */
-     1,                         /* Reverse              */
-     1,                         /* Chan Reg             */
-     CMODE_r,                   /* Channel Mode         */
-     1,                         /* vidents              */
-     0,                         /* svshold              */
-     1,                         /* time stamp on mode   */
-     0,                         /* NICKIP               */
-     0,                         /* O:LINE               */
-     1,                         /* UMODE                */
-     0,                         /* VHOST ON NICK        */
-     1,                         /* Change RealName      */
-     CMODE_K,                   /* No Knock             */
-     CMODE_A,                   /* Admin Only           */
-     DEFAULT_MLOCK,             /* Default MLOCK        */
-     UMODE_x,                   /* Vhost Mode           */
-     1,                         /* +f                   */
-     1,                         /* +L                   */
-     CMODE_f,
-     CMODE_L,
-     0,
-     1,                         /* No Knock requires +i */
-     NULL,                      /* CAPAB Chan Modes             */
-     1,                         /* We support TOKENS */
-     0,                         /* TOKENS are CASE inSensitive */
-     0,                         /* TIME STAMPS are BASE64 */
-     0,                         /* +I support */
-     0,                         /* SJOIN ban char */
-     0,                         /* SJOIN except char */
-     0,                         /* SJOIN invite char */
-     0,                         /* Can remove User Channel Modes with SVSMODE */
-     0,                         /* Sglines are not enforced until user reconnects */
-     "x",                       /* vhost char */
-     0,                         /* ts6 */
-     1,                         /* support helper umode */
-     0,                         /* p10 */
-     NULL,                      /* character set */
-     0,                         /* reports sync state */
-     0,                         /* CIDR channelbans */
-     }
-    ,
-    {NULL}
-};
-
-
-IRCDCAPAB myIrcdcap[] = {
-    {
-     CAPAB_NOQUIT,              /* NOQUIT       */
-     0,                         /* TSMODE       */
-     0,                         /* UNCONNECT    */
-     0,                         /* NICKIP       */
-     0,                         /* SJOIN        */
-     0,                         /* ZIP          */
-     0,                         /* BURST        */
-     0,                         /* TS5          */
-     0,                         /* TS3          */
-     0,                         /* DKEY         */
-     0,                         /* PT4          */
-     0,                         /* SCS          */
-     0,                         /* QS           */
-     0,                         /* UID          */
-     CAPAB_KNOCK,               /* KNOCK        */
-     0,                         /* CLIENT       */
-     0,                         /* IPV6         */
-     0,                         /* SSJ5         */
-     0,                         /* SN2          */
-     CAPAB_TOKEN,               /* TOKEN        */
-     0,                         /* VHOST        */
-     0,                         /* SSJ3         */
-     0,                         /* NICK2        */
-     0,                         /* UMODE2       */
-     0,                         /* VL           */
-     0,                         /* TLKEXT       */
-     0,                         /* DODKEY       */
-     0,                         /* DOZIP        */
-     CAPAB_CHANMODE,            /* CHANMODE             */
-     0, 0}
-};
-
-void ultiamte2_set_umode(User * user, int ac, const char **av)
-{
-    int add = 1;                /* 1 if adding modes, 0 if deleting */
-    const char *modes = av[0];
-
-    ac--;
-
-    if (debug)
-        alog("debug: Changing mode for %s to %s", user->nick, modes);
-
-    while (*modes) {
-
-        /* This looks better, much better than "add ? (do_add) : (do_remove)".
-         * At least this is readable without paying much attention :) -GD
-         */
-        if (add)
-            user->mode |= umodes[(int) *modes];
-        else
-            user->mode &= ~umodes[(int) *modes];
-
-        switch (*modes++) {
-        case '+':
-            add = 1;
-            break;
-        case '-':
-            add = 0;
-            break;
-        case 'a':
-            if (add && !is_services_oper(user)) {
-                common_svsmode(user, "-a", NULL);
-                user->mode &= ~UMODE_a;
-            }
-            break;
-        case 'P':
-            if (add && !is_services_admin(user)) {
-                common_svsmode(user, "-P", NULL);
-                user->mode &= ~UMODE_P;
-            }
-            break;
-        case 'R':
-            if (add && !is_services_root(user)) {
-                common_svsmode(user, "-R", NULL);
-                user->mode &= ~UMODE_R;
-            }
-            break;
-        case 'd':
-            if (ac == 0) {
-                break;
-            }
-
-            ac--;
-            av++;
-            user->svid = strtoul(*av, NULL, 0);
-            break;
-        case 'o':
-            if (add) {
-                opcnt++;
-                if (WallOper) {
-                    anope_cmd_global(s_OperServ,
-                                     "\2%s\2 is now an IRC operator.",
-                                     user->nick);
-                }
-                display_news(user, NEWS_OPER);
-                if (is_services_oper(user)) {
-                    common_svsmode(user, "+a", NULL);
-                    user->mode |= UMODE_a;
-                }
-                if (is_services_admin(user)) {
-                    common_svsmode(user, "+P", NULL);
-                    user->mode |= UMODE_P;
-                }
-                if (is_services_root(user)) {
-                    common_svsmode(user, "+R", NULL);
-                    user->mode |= UMODE_R;
-                }
-            } else {
-                opcnt--;
-            }
-            break;
-        case 'r':
-            if (add && !nick_identified(user)) {
-                common_svsmode(user, "-r", NULL);
-                user->mode &= ~UMODE_r;
-            }
-            break;
-        case 'x':
-            update_host(user);
-            break;
-        }
-    }
-}
-
-unsigned long umodes[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, UMODE_A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    UMODE_P,
-    0,
-    UMODE_R,
-    0, 0, 0, 0, 0, 0, 0,
-    0,
-    0, 0, 0, 0, 0,
-    0, UMODE_a, 0, 0, 0, 0, 0,
-    UMODE_g,
-    UMODE_h, UMODE_i, 0, 0, 0, 0, 0, UMODE_o,
-    UMODE_p,
-    0, UMODE_r, 0, 0, 0, 0, UMODE_w,
-    UMODE_x,
-    0,
-    0,
-    0, 0, 0, 0, 0
-};
-
-char myCsmodes[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,
-
-    '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 myCmmodes[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}, {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},
-    {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 myCbmodes[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},
-    {CMODE_A, CBM_NO_USER_MLOCK, NULL, NULL},
-    {0},                        /* B */
-    {0},                        /* C */
-    {0},                        /* D */
-    {0},                        /* E */
-    {0},                        /* F */
-    {0},                        /* G */
-    {0},                        /* H */
-    {CMODE_I, 0, NULL, NULL},   /* I */
-    {0},                        /* J */
-    {CMODE_K, 0, NULL, NULL},   /* K */
-    {CMODE_L, 0, set_redirect, cs_set_redirect},
-    {0},                        /* M */
-    {0},                        /* N */
-    {CMODE_O, CBM_NO_USER_MLOCK, NULL, NULL},
-    {0},                        /* P */
-    {0},                        /* Q */
-    {CMODE_R, 0, NULL, NULL},   /* R */
-    {CMODE_S, 0, NULL, NULL},   /* S */
-    {0},                        /* T */
-    {0},                        /* U */
-    {0},                        /* V */
-    {0},                        /* W */
-    {0},                        /* X */
-    {0},                        /* Y */
-    {0},                        /* Z */
-    {0}, {0}, {0}, {0}, {0}, {0},
-    {0},                        /* a */
-    {0},                        /* b */
-    {0},                        /* c */
-    {0},                        /* d */
-    {0},                        /* e */
-    {CMODE_f, 0, set_flood, cs_set_flood},
-    {0},                        /* g */
-    {0},                        /* h */
-    {CMODE_i, 0, NULL, NULL},   /* i */
-    {0},                        /* j */
-    {CMODE_k, 0, chan_set_key, cs_set_key},
-    {CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
-    {CMODE_m, 0, NULL, NULL},   /* m */
-    {CMODE_n, 0, NULL, NULL},   /* n */
-    {0},                        /* o */
-    {CMODE_p, 0, NULL, NULL},   /* p */
-    {0},                        /* q */
-    {CMODE_r, CBM_NO_MLOCK, NULL, NULL},
-    {CMODE_s, 0, NULL, NULL},   /* s */
-    {CMODE_t, 0, NULL, NULL},   /* t */
-    {0},                        /* u */
-    {0},                        /* v */
-    {0},                        /* w */
-    {CMODE_x, 0, NULL, NULL},   /* x */
-    {0},                        /* y */
-    {0},                        /* z */
-    {0}, {0}, {0}, {0}
-};
-
-CBModeInfo myCbmodeinfos[] = {
-    {'f', CMODE_f, 0, get_flood, cs_get_flood},
-    {'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},
-    {'r', CMODE_r, 0, NULL, NULL},
-    {'s', CMODE_s, 0, NULL, NULL},
-    {'t', CMODE_t, 0, NULL, NULL},
-    {'x', CMODE_x, 0, NULL, NULL},
-    {'A', CMODE_A, 0, NULL, NULL},
-    {'I', CMODE_I, 0, NULL, NULL},
-    {'K', CMODE_K, 0, NULL, NULL},
-    {'L', CMODE_L, 0, get_redirect, cs_get_redirect},
-    {'O', CMODE_O, 0, NULL, NULL},
-    {'R', CMODE_R, 0, NULL, NULL},
-    {'S', CMODE_S, 0, NULL, NULL},
-    {0}
-};
-
-CUMode myCumodes[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}
-};
-
-
-int anope_event_setname(const char *source, int ac, const char **av)
-{
-    User *u;
-
-    if (ac != 1)
-        return MOD_CONT;
-
-    u = finduser(source);
-    if (!u) {
-        if (debug) {
-            alog("debug: SETNAME for nonexistent user %s", source);
-        }
-        return MOD_CONT;
-    }
-
-    u->SetRealname(av[0]);
-    return MOD_CONT;
-}
-
-int anope_event_chgname(const char *source, int ac, const char **av)
-{
-    User *u;
-
-    if (ac != 2)
-        return MOD_CONT;
-
-    u = finduser(av[0]);
-    if (!u) {
-        if (debug) {
-            alog("debug: CHGNAME for nonexistent user %s", av[0]);
-        }
-        return MOD_CONT;
-    }
-
-    u->SetRealname(av[1]);
-    return MOD_CONT;
-}
-
-int anope_event_setident(const char *source, int ac, const char **av)
-{
-    User *u;
-
-    if (ac != 1)
-        return MOD_CONT;
-
-    u = finduser(source);
-    if (!u) {
-        if (debug) {
-            alog("debug: SETIDENT for nonexistent user %s", source);
-        }
-        return MOD_CONT;
-    }
-
-    u->SetIdent(av[0]);
-    return MOD_CONT;
-}
-
-int anope_event_chgident(const char *source, int ac, const char **av)
-{
-    User *u;
-
-    if (ac != 2)
-        return MOD_CONT;
-
-    u = finduser(av[0]);
-    if (!u) {
-        if (debug) {
-            alog("debug: CHGIDENT for nonexistent user %s", av[0]);
-        }
-        return MOD_CONT;
-    }
-
-    u->SetIdent(av[1]);
-    return MOD_CONT;
-}
-
-int anope_event_sethost(const char *source, int ac, const char **av)
-{
-    User *u;
-
-    if (ac != 1)
-        return MOD_CONT;
-
-    u = finduser(source);
-    if (!u) {
-        if (debug) {
-            alog("debug: SETHOST for nonexistent user %s", source);
-        }
-        return MOD_CONT;
-    }
-
-    u->SetDisplayedHost(av[0]);
-    return MOD_CONT;
-}
-
-int anope_event_nick(const char *source, int ac, const char **av)
-{
-    if (ac != 2) {
-        if (ac == 7) {
-            do_nick(source, av[0], av[3], av[4], av[5], av[6],
-                    strtoul(av[2], NULL, 10), 0, 0, NULL, NULL);
-        } else {
-            do_nick(source, av[0], av[3], av[4], av[5], av[7],
-                    strtoul(av[2], NULL, 10), strtoul(av[6], NULL, 0), 0,
-                    NULL, NULL);
-        }
-    } else {
-        do_nick(source, av[0], NULL, NULL, NULL, NULL,
-                strtoul(av[1], NULL, 10), 0, 0, NULL, NULL);
-    }
-    return MOD_CONT;
-}
-
-int anope_event_chghost(const char *source, int ac, const char **av)
-{
-    User *u;
-
-    if (ac != 2)
-        return MOD_CONT;
-
-    u = finduser(av[0]);
-    if (!u) {
-        if (debug) {
-            alog("debug: CHGHOST for nonexistent user %s", av[0]);
-        }
-        return MOD_CONT;
-    }
-
-    u->SetDisplayedHost(av[1]);
-    return MOD_CONT;
-}
-
-int anope_event_436(const char *source, int ac, const char **av)
-{
-    if (ac < 1)
-        return MOD_CONT;
-
-    m_nickcoll(av[0]);
-    return MOD_CONT;
-}
-
-
-/* *INDENT-OFF* */
-void moduleAddIRCDMsgs(void) {
-    Message *m;
-
-    updateProtectDetails("PROTECT","PROTECTME","protect","deprotect","AUTOPROTECT","+a","-a");
-
-    m = createMessage("401",       anope_event_null); addCoreMessage(IRCD,m);
-    m = createMessage("436",       anope_event_436); addCoreMessage(IRCD,m);
-    m = createMessage("402",       anope_event_null); addCoreMessage(IRCD,m);
-    m = createMessage("AWAY",      anope_event_away); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("6",       anope_event_away); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("INVITE",    anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("*",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("JOIN",      anope_event_join); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("C",       anope_event_join); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("KICK",      anope_event_kick); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("H",       anope_event_kick); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("KILL",      anope_event_kill); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage(".",       anope_event_kill); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("MODE",      anope_event_mode); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("G",       anope_event_mode); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("MOTD",      anope_event_motd); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("F",       anope_event_motd); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("NICK",      anope_event_nick); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("&",       anope_event_nick); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("NOTICE",    anope_event_notice); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("B",       anope_event_notice); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("PART",      anope_event_part); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("D",       anope_event_part); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("PASS",      anope_event_pass); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("<",       anope_event_pass); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("PING",      anope_event_ping); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("9",       anope_event_ping); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("PRIVMSG",   anope_event_privmsg); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!",       anope_event_privmsg); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("QUIT",      anope_event_quit); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage(",",       anope_event_quit); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SERVER",    anope_event_server); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("'",       anope_event_server); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SQUIT",     anope_event_squit); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("-",       anope_event_squit); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("TOPIC",     anope_event_topic); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage(")",       anope_event_topic); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("USER",      anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("%",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("WALLOPS",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("=",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("WHOIS",     anope_event_whois); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("#",       anope_event_whois); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("AKILL",     anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("V",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("GLOBOPS",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("]",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("GNOTICE",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("Z",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("GOPER",     anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("[",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("RAKILL",    anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("Y",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SILENCE",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("U",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SVSKILL",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("h",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SVSMODE",   anope_event_mode); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("n",       anope_event_mode); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SVSNICK",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("e",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SVSNOOP",   anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("f",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SQLINE",    anope_event_sqline); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("c",       anope_event_sqline); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("UNSQLINE",  anope_event_null); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("d",       anope_event_null); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("PROTOCTL",  anope_event_capab); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("_",       anope_event_capab); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("CHGHOST",   anope_event_chghost); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!<",       anope_event_chghost); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("CHGIDENT",  anope_event_chgident); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!=",       anope_event_chgident); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("NETINFO",   anope_event_netinfo); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("u",       anope_event_netinfo); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SNETINFO",  anope_event_snetinfo); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!1",      anope_event_snetinfo); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SETHOST",   anope_event_sethost); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!8",       anope_event_sethost); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SETIDENT",  anope_event_setident); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!9",       anope_event_setident); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("SETNAME",   anope_event_setname); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!;",       anope_event_setname); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("VCTRL",     anope_event_vctrl); addCoreMessage(IRCD,m);
-    if (UseTokens) {
-      m = createMessage("!I",      anope_event_vctrl); addCoreMessage(IRCD,m);
-    }
-    m = createMessage("REHASH",     anope_event_rehash); addCoreMessage(IRCD,m);
-    m = createMessage("ADMIN",      anope_event_admin); addCoreMessage(IRCD,m);
-    m = createMessage("CREDITS",    anope_event_credits); addCoreMessage(IRCD,m);
-    m = createMessage("ERROR",      anope_event_error); addCoreMessage(IRCD,m);
-
-
-}
-
-/* *INDENT-ON* */
-
-/* Event: PROTOCTL */
-int anope_event_capab(const char *source, int ac, const char **av)
-{
-    capab_parse(ac, av);
-    return MOD_CONT;
-}
-
-void ultimate2_cmd_sqline(const char *mask, const char *reason)
-{
-    send_cmd(NULL, "SQLINE %s :%s", mask, reason);
-}
-
-void UltimateIRCdProto::cmd_svsnoop(const char *server, int set)
-{
-	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
-}
-
-void ultimate2_cmd_svsadmin(const char *server, int set)
-{
-	ircd_proto.cmd_svsnoop(server, set);
-}
-
-void UltimateIRCdProto::cmd_remove_akill(const char *user, const char *host)
-{
-	send_cmd(NULL, "RAKILL %s %s", host, user);
-}
-
-
-void ultimate2_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                         const char *topic, time_t when)
-{
-    send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
-             (unsigned long int) when, topic);
-}
-
-void ultimate2_cmd_vhost_off(User * u)
-{
-    /* does not support removing vhosting */
-}
-
-void ultimate2_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
-{
-    if (vIdent) {
-        send_cmd(ServerName, "CHGIDENT %s %s", nick, vIdent);
-    }
-    send_cmd(s_HostServ, "SVSMODE %s +x", nick);
-    send_cmd(ServerName, "CHGHOST %s %s", nick, vhost);
-}
-
-void ultimate2_cmd_unsqline(const char *user)
-{
-    send_cmd(NULL, "UNSQLINE %s", user);
-}
-
-void ultimate2_cmd_join(const char *user, const char *channel, time_t chantime)
-{
-    send_cmd(user, "JOIN %s", channel);
-}
-
-void ultimate2_cmd_akill(const char *user, const char *host, const char *who, time_t when,
-                         time_t expires, const char *reason)
-{
-    send_cmd(NULL, "AKILL %s %s :%s", host, user, reason);
-}
-
-void ultimate2_cmd_svskill(const char *source, const char *user, const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(source, "KILL %s :%s", user, buf);
-}
-
-void ultimate2_cmd_svsmode(User * u, int ac, const char **av)
-{
-    send_cmd(ServerName, "SVSMODE %s %s%s%s", u->nick, av[0],
-             (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
-}
-
-void ultimate2_cmd_capab()
-{
-    if (UseTokens) {
-        send_cmd(NULL, "PROTOCTL NOQUIT TOKEN SILENCE KNOCK");
-    } else {
-        send_cmd(NULL, "PROTOCTL NOQUIT SILENCE KNOCK");
-    }
-}
-
-
-/* PASS */
-void ultimate2_cmd_pass(const char *pass)
-{
-    send_cmd(NULL, "PASS :%s", pass);
-}
-
-/* SERVER name hop descript */
-void ultimate2_cmd_server(const char *servname, int hop, const char *descript)
-{
-    send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
-}
-
-/* PONG */
-void ultimate2_cmd_pong(const char *servname, const char *who)
-{
-    send_cmd(servname, "PONG %s", who);
-}
-
-void ultimate2_cmd_connect(int servernum)
-{
-    me_server =
-        new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
-
-    ultimate2_cmd_capab();
-    if (servernum == 1)
-        ultimate2_cmd_pass(RemotePassword);
-    if (servernum == 2)
-        ultimate2_cmd_pass(RemotePassword2);
-    if (servernum == 3)
-        ultimate2_cmd_pass(RemotePassword3);
-    ultimate2_cmd_server(ServerName, 1, ServerDesc);
-}
-
-/* CHGHOST */
-void ultimate2_cmd_chghost(const char *nick, const char *vhost)
-{
-    if (!nick || !vhost) {
-        return;
-    }
-    send_cmd(ServerName, "CHGHOST %s %s", nick, vhost);
-}
-
-/* CHGIDENT */
-void ultimate2_cmd_chgident(const char *nick, const char *vIdent)
-{
-    if (!nick || !vIdent) {
-        return;
-    }
-    send_cmd(ServerName, "CHGIDENT %s %s", nick, vIdent);
-}
-
-/* INVITE */
-void ultimate2_cmd_invite(const char *source, const char *chan, const char *nick)
-{
-    if (!source || !chan || !nick) {
-        return;
-    }
-
-    send_cmd(source, "INVITE %s %s", nick, chan);
-}
-
-/* PART */
-void ultimate2_cmd_part(const char *nick, const char *chan, const char *buf)
-{
-    if (!nick || !chan) {
-        return;
-    }
-
-    if (buf) {
-        send_cmd(nick, "PART %s :%s", chan, buf);
-    } else {
-        send_cmd(nick, "PART %s", chan);
-    }
-}
-
-/* 391 */
-void ultimate2_cmd_391(const char *source, const char *timestr)
-{
-    if (!timestr) {
-        return;
-    }
-    send_cmd(NULL, "391 :%s %s :%s", source, ServerName, timestr);
-}
-
-/* 250 */
-void ultimate2_cmd_250(const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(NULL, "250 %s", buf);
-}
-
-/* 307 */
-void ultimate2_cmd_307(const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(ServerName, "307 %s", buf);
-}
-
-/* 311 */
-void ultimate2_cmd_311(const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(ServerName, "311 %s", buf);
-}
-
-/* 312 */
-void ultimate2_cmd_312(const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(ServerName, "312 %s", buf);
-}
-
-/* 317 */
-void ultimate2_cmd_317(const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(ServerName, "317 %s", buf);
-}
-
-/* 219 */
-void ultimate2_cmd_219(const char *source, const char *letter)
-{
-    if (!source) {
-        return;
-    }
-
-    if (letter) {
-        send_cmd(NULL, "219 %s %c :End of /STATS report.", source,
-                 *letter);
-    } else {
-        send_cmd(NULL, "219 %s l :End of /STATS report.", source);
-    }
-}
-
-/* 401 */
-void ultimate2_cmd_401(const char *source, const char *who)
-{
-    if (!source || !who) {
-        return;
-    }
-    send_cmd(ServerName, "401 %s %s :No such service.", source, who);
-}
-
-/* 318 */
-void ultimate2_cmd_318(const char *source, const char *who)
-{
-    if (!source || !who) {
-        return;
-    }
-
-    send_cmd(ServerName, "318 %s %s :End of /WHOIS list.", source, who);
-}
-
-/* 242 */
-void ultimate2_cmd_242(const char *buf)
-{
-    if (!buf) {
-        return;
-    }
-
-    send_cmd(NULL, "242 %s", buf);
-}
-
-/* 243 */
-void ultimate2_cmd_243(const char *buf)
-{
-    if (!buf) {
-        return;