BUILD : 1.7.12 (947) BUGS : NOTES : Updated inspircd support module and fixed error with generating language.h on certain setups

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


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

3 files changed, 583 insertions, 444 deletions

diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index 64e85dadd..c91df3dde 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -36,6 +36,7 @@ int AnopeInit(int argc, char **argv)
     moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
 
     if (DisableRaw) {
+		alog("[os_raw] Unloading because DisableRaw is enabled");
         return MOD_STOP;
     }
     return MOD_CONT;
diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index cd7913d07..aae093365 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -1,5 +1,6 @@
-/* InspIRCd beta 3 functions
+/* inspircd beta 6+ functions
  *
+ * (C) 2005 Craig Edwards <brain@inspircd.org>
  * (C) 2003-2005 Anope Team
  * Contact us at info@anope.org
  *
@@ -19,37 +20,37 @@
 
 #ifdef _WIN32
 #include "winsock.h"
-int inet_aton(const char *name, struct in_addr *addr)
+int inet_aton (const char *name, struct in_addr *addr)
 {
-    uint32 a = inet_addr(name);
-    addr->s_addr = a;
-    return a != (uint32) - 1;
+     uint32 a = inet_addr (name);
+     addr->s_addr = a;
+     return a != (uint32)-1;
 }
 #endif
 
 IRCDVar myIrcd[] = {
-    {"InspIRCd 1.0 Beta",       /* ircd name */
-     "+o",                      /* nickserv mode */
-     "+o",                      /* chanserv mode */
-     "+o",                      /* memoserv mode */
-     "+o",                      /* hostserv mode */
-     "+io",                     /* operserv mode */
-     "+o",                      /* botserv mode  */
-     "+o",                      /* helpserv mode */
-     "+i",                      /* Dev/Null mode */
-     "+io",                     /* Global mode   */
-     "+o",                      /* nickserv alias mode */
-     "+o",                      /* chanserv alias mode */
-     "+o",                      /* memoserv alias mode */
-     "+io",                     /* hostserv alias mode */
-     "+io",                     /* operserv alias mode */
-     "+o",                      /* botserv alias mode  */
-     "+o",                      /* helpserv alias mode */
-     "+i",                      /* Dev/Null alias mode */
-     "+io",                     /* Global alias mode   */
-     "+i",                      /* Used by BotServ Bots */
+    {"InspIRCd Beta 6",         /* ircd name */
+     "+o",                     /* nickserv mode */
+     "+o",                     /* chanserv mode */
+     "+o",                     /* memoserv mode */
+     "+o",                     /* hostserv mode */
+     "+io",                    /* operserv mode */
+     "+o",                     /* botserv mode  */
+     "+o",                     /* helpserv mode */
+     "+i",                     /* Dev/Null mode */
+     "+io",                    /* Global mode   */
+     "+o",                     /* nickserv alias mode */
+     "+o",                     /* chanserv alias mode */
+     "+o",                     /* memoserv alias mode */
+     "+io",                    /* hostserv alias mode */
+     "+io",                    /* operserv alias mode */
+     "+o",                     /* botserv alias mode  */
+     "+o",                     /* helpserv alias mode */
+     "+i",                     /* Dev/Null alias mode */
+     "+io",                    /* Global alias mode   */
+     "+s",                     /* Used by BotServ Bots */
      5,                         /* Chan Max Symbols     */
-     "-cilmnpstuzCGKNOQRSV",    /* Modes to Remove */
+     "-cilmnpstuzACGHKNOQRSV",  /* Modes to Remove */
      "+ao",                     /* Channel Umode used by Botserv bots */
      1,                         /* SVSNICK */
      1,                         /* Vhost  */
@@ -61,13 +62,13 @@ IRCDVar myIrcd[] = {
      "+r",                      /* Mode On Reg          */
      "-r",                      /* Mode on UnReg        */
      "-r",                      /* Mode on Nick Change  */
-     0,                         /* Supports SGlines     */
+     1,                         /* Supports SGlines     */
      1,                         /* Supports SQlines     */
      1,                         /* Supports SZlines     */
      1,                         /* Supports Halfop +h   */
-     3,                         /* Number of server args */
+     4,                         /* Number of server args */
      0,                         /* Join 2 Set           */
-     0,                         /* Join 2 Message       */
+     1,                         /* Join 2 Message       */
      0,                         /* Has exceptions +e    */
      1,                         /* TS Topic Forward     */
      0,                         /* TS Topci Backward    */
@@ -84,23 +85,23 @@ IRCDVar myIrcd[] = {
      0,                         /* svshold              */
      0,                         /* time stamp on mode   */
      0,                         /* NICKIP               */
-     0,                         /* O:LINE               */
-     1,                         /* UMODE               */
+     1,                         /* O:LINE               */
+     0,                         /* UMODE               */
      1,                         /* VHOST ON NICK        */
-     1,                         /* Change RealName      */
+     0,                         /* Change RealName      */
      CMODE_K,                   /* No Knock             */
      0,                         /* Admin Only           */
      DEFAULT_MLOCK,             /* Default MLOCK       */
      UMODE_x,                   /* Vhost Mode           */
      0,                         /* +f                   */
      1,                         /* +L                   */
-     0,
+     CMODE_f,
      CMODE_L,
      0,
-     0,                         /* No Knock requires +i */
+     1,                         /* No Knock requires +i */
      NULL,                      /* CAPAB Chan Modes             */
-     1,                         /* We support inspircd TOKENS */
-     0,                         /* TOKENS are CASE Sensitive */
+     0,                         /* We support inspircd TOKENS */
+     1,                         /* TOKENS are CASE inSensitive */
      0,                         /* TIME STAMPS are BASE64 */
      0,                         /* +I support */
      0,                         /* SJOIN ban char */
@@ -110,10 +111,10 @@ IRCDVar myIrcd[] = {
      0,                         /* Sglines are not enforced until user reconnects */
      "x",                       /* vhost char */
      0,                         /* ts6 */
-     0,                         /* support helper umode */
+     1,                         /* support helper umode */
      0,                         /* p10 */
      NULL,                      /* character set */
-     1,                         /* reports sync state */
+     0,                         /* reports sync state */
      }
     ,
     {NULL}
@@ -141,13 +142,13 @@ IRCDCAPAB myIrcdcap[] = {
      0,                         /* IPV6         */
      0,                         /* SSJ5         */
      0,                         /* SN2          */
-     CAPAB_TOKEN,               /* TOKEN        */
+     0,                         /* TOKEN        */
      0,                         /* VHOST        */
-     0,                         /* SSJ3         */
-     0,                         /* NICK2        */
+     CAPAB_SSJ3,                /* SSJ3         */
+     CAPAB_NICK2,               /* NICK2        */
      0,                         /* UMODE2       */
-     0,                         /* VL           */
-     0,                         /* TLKEXT       */
+     CAPAB_VL,                  /* VL           */
+     CAPAB_TLKEXT,              /* TLKEXT       */
      0,                         /* DODKEY       */
      0,                         /* DOZIP        */
      0,
@@ -159,14 +160,14 @@ 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,
     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,
     UMODE_g,
     UMODE_h, UMODE_i, 0, 0, 0, 0, 0, UMODE_o,
     0,
@@ -218,7 +219,7 @@ CMMode myCmmodes[128] = {
     {add_ban, del_ban},
     {NULL},
     {NULL},
-    {add_exception, del_exception},
+    {NULL, NULL},
     {NULL},
     {NULL},
     {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL},
@@ -398,6 +399,15 @@ void inspircd_set_umode(User * user, int ac, char **av)
         case '-':
             add = 0;
             break;
+        case 'd':
+            if (ac == 0) {
+                break;
+            }
+
+            ac--;
+            av++;
+            user->svid = strtoul(*av, NULL, 0);
+            break;
         case 'o':
             if (add) {
                 opcnt++;
@@ -424,87 +434,66 @@ void inspircd_set_umode(User * user, int ac, char **av)
     }
 }
 
-/* Set mod_current_buffer from here */
-void inspircd_set_mod_current_buffer(int ac, char **av)
-{
-    if (ac >= 3)
-        mod_current_buffer = sstrdup(av[2]);
-    else
-        mod_current_buffer = NULL;
-}
-
-int anope_event_nickchange(char *source, int ac, char **av);
-int anope_event_servertopic(char *source, int ac, char **av);
-int anope_event_servermode(char *source, int ac, char **av);
 
 /* *INDENT-OFF* */
 void moduleAddIRCDMsgs(void) {
     Message *m;
 
-    /* user has no choice but to use tokens with InspIRCd :) */
-    UseTokens = 1;
-
-    updateProtectDetails("PROTECT","PROTECTME","protect","deprotect","AUTOPROTECT","+a","-a");
-
-    m = createMessage("$",      anope_event_null); addCoreMessage(IRCD,m);		/* send routing table */
-    m = createMessage("X",      anope_event_null); addCoreMessage(IRCD,m);		/* begin netburst NOW */
-    m = createMessage("Y",      anope_event_eob); addCoreMessage(IRCD,m);		/* end of UPLINK netburst */
-    m = createMessage("H",      anope_event_null); addCoreMessage(IRCD,m);		/* local sync start */
-    m = createMessage("F",      anope_event_null); addCoreMessage(IRCD,m);		/* local sync end */
-    m = createMessage("f",      anope_event_null); addCoreMessage(IRCD,m);		/* local U-lined sync end */
-    m = createMessage("*",      anope_event_null); addCoreMessage(IRCD,m);		/* no operation */
-    m = createMessage("|",      anope_event_null); addCoreMessage(IRCD,m);		/* oper type */
-    m = createMessage("-",      anope_event_null); addCoreMessage(IRCD,m);		/* start mesh operation */
-    m = createMessage("s",      anope_event_server); addCoreMessage(IRCD,m);		/* passive server response */
-    m = createMessage("U",      anope_event_null); addCoreMessage(IRCD,m);		/* active service connect  */
-    m = createMessage("J",      anope_event_join); addCoreMessage(IRCD,m);		/* join */
-    m = createMessage("k",      anope_event_kick); addCoreMessage(IRCD,m);		/* kick */
-    m = createMessage("K",      anope_event_kill); addCoreMessage(IRCD,m);		/* kill */
-    m = createMessage("M",      anope_event_servermode); addCoreMessage(IRCD,m);	/* servermode */
-    m = createMessage("m",      anope_event_mode); addCoreMessage(IRCD,m);              /* mode */
-    m = createMessage("N",      anope_event_nick); addCoreMessage(IRCD,m);		/* nick (introduce) */
-    m = createMessage("n",      anope_event_nickchange); addCoreMessage(IRCD,m);	/* nick (change) */
-    m = createMessage("V",      anope_event_null); addCoreMessage(IRCD,m);		/* notice */
-    m = createMessage("L",      anope_event_part); addCoreMessage(IRCD,m);		/* part */
-    m = createMessage("?",      anope_event_ping); addCoreMessage(IRCD,m);		/* ping */
-    m = createMessage("P",      anope_event_privmsg); addCoreMessage(IRCD,m);		/* privmsg */
-    m = createMessage("Q",      anope_event_quit); addCoreMessage(IRCD,m);		/* quit */
-    m = createMessage("&",      anope_event_squit); addCoreMessage(IRCD,m);		/* squit */
-    m = createMessage("t",      anope_event_topic); addCoreMessage(IRCD,m);		/* topic (user) */
-    m = createMessage("T",      anope_event_servertopic); addCoreMessage(IRCD,m);	/* topic (server) */
-    m = createMessage("@",      anope_event_null); addCoreMessage(IRCD,m);		/* wallops */
-    m = createMessage("b",      anope_event_chghost); addCoreMessage(IRCD,m);		/* change displayed host */
-    m = createMessage("a",      anope_event_chgname); addCoreMessage(IRCD,m);		/* change gecos */
-}
-
-char* xsumtable = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-char* CreateSum()
-{
-	int q = 0;
-        static char sum[8];
-        sum[7] = '\0';
-        for(q = 0; q < 7; q++)
-                sum[q] = xsumtable[rand()%52];
-        return sum;
-}
-
-/* Event: PROTOCTL */
-int anope_event_capab(char *source, int ac, char **av)
-{
-    capab_parse(ac, av);
-    return MOD_CONT;
-}
-
-int anope_event_nickchange(char *source, int ac, char **av)
-{
-    do_nick(av[0], av[1], NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
-    return MOD_CONT;
-}
+    updateProtectDetails("PROTECT","PROTECTME","!protect","!deprotect","AUTOPROTECT","+a","-a");
+
+    m = createMessage("436",       anope_event_436); addCoreMessage(IRCD,m);
+    m = createMessage("AWAY",      anope_event_away); addCoreMessage(IRCD,m);
+    m = createMessage("INVITE",    anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("JOIN",      anope_event_join); addCoreMessage(IRCD,m);
+    m = createMessage("KICK",      anope_event_kick); addCoreMessage(IRCD,m);
+    m = createMessage("KILL",      anope_event_kill); addCoreMessage(IRCD,m);
+    m = createMessage("MODE",      anope_event_mode); addCoreMessage(IRCD,m);
+    m = createMessage("MOTD",      anope_event_motd); addCoreMessage(IRCD,m);
+    m = createMessage("NICK",      anope_event_nick); addCoreMessage(IRCD,m);
+    m = createMessage("NOTICE",    anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("PART",      anope_event_part); addCoreMessage(IRCD,m);
+    m = createMessage("PING",      anope_event_ping); addCoreMessage(IRCD,m);
+    m = createMessage("PRIVMSG",   anope_event_privmsg); addCoreMessage(IRCD,m);
+    m = createMessage("QUIT",      anope_event_quit); addCoreMessage(IRCD,m);
+    m = createMessage("SERVER",    anope_event_server); addCoreMessage(IRCD,m);
+    m = createMessage("SQUIT",     anope_event_squit); addCoreMessage(IRCD,m);
+    m = createMessage("TOPIC",     anope_event_topic); addCoreMessage(IRCD,m);
+    m = createMessage("WALLOPS",   anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("WHOIS",     anope_event_whois); addCoreMessage(IRCD,m);
+    m = createMessage("GLOBOPS",   anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("SILENCE",   anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("SAMODE",    anope_event_samode); addCoreMessage(IRCD,m);
+    m = createMessage("SANICK",    anope_event_sanick); addCoreMessage(IRCD,m);
+    m = createMessage("SAJOIN",    anope_event_sajoin); addCoreMessage(IRCD,m);
+    m = createMessage("SAPART",    anope_event_sapart);addCoreMessage(IRCD,m);
+    m = createMessage("QLINE",     anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("GLINE",     anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("ELINE",     anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("ZLINE",     anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("ADDLINE",   anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("FHOST",     anope_event_chghost); addCoreMessage(IRCD,m);
+    m = createMessage("CHGIDENT",  anope_event_chgident); addCoreMessage(IRCD,m);
+    m = createMessage("FNAME",     anope_event_chgname); addCoreMessage(IRCD,m);
+    m = createMessage("METADATA",  anope_event_null); addCoreMessage(IRCD,m);
+    m = createMessage("SETHOST",   anope_event_sethost); addCoreMessage(IRCD,m);
+    m = createMessage("SETIDENT",  anope_event_setident); addCoreMessage(IRCD,m);
+    m = createMessage("SETNAME",   anope_event_setname); 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("FJOIN",     anope_event_fjoin); addCoreMessage(IRCD,m);
+    m = createMessage("FMODE",     anope_event_fmode); addCoreMessage(IRCD,m);
+    m = createMessage("FTOPIC",    anope_event_ftopic); addCoreMessage(IRCD,m);
+    m = createMessage("VERSION",   anope_event_version); addCoreMessage(IRCD,m);
+    m = createMessage("OPERTYPE",  anope_event_opertype); addCoreMessage(IRCD,m);
+    m = createMessage("IDLE",      anope_event_idle); addCoreMessage(IRCD,m);
+}
+
+/* *INDENT-ON* */
 
 void inspircd_cmd_svsnoop(char *server, int set)
 {
-    send_cmd(CreateSum(), "*");
+    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
 }
 
 void inspircd_cmd_svsadmin(char *server, int set)
@@ -514,68 +503,78 @@ void inspircd_cmd_svsadmin(char *server, int set)
 
 void inspircd_cmd_remove_akill(char *user, char *host)
 {
-    send_cmd(CreateSum(), ". %s@%s %s", user, host, s_OperServ);
+    send_cmd(s_OperServ, "GLINE %s@%s", user, host);
 }
 
 void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit,
-                     char *topic, time_t when)
+                      char *topic, time_t when)
 {
-    send_cmd(CreateSum(), "t %s %s :%s", whosets, chan, topic);
+    send_cmd(ServerName, "FTOPIC %s %lu %s :%s", chan, (unsigned long int) when, whosetit, topic);
 }
 
 void inspircd_cmd_vhost_off(User * u)
 {
-    send_cmd(CreateSum(), "m %s %s -x", s_HostServ, u->nick);
+    send_cmd(s_HostServ, "MODE %s -x", u->nick);
 }
 
 void inspircd_cmd_akill(char *user, char *host, char *who, time_t when,
-                     time_t expires, char *reason)
+                      time_t expires, char *reason)
 {
-    send_cmd(CreateSum(), "# %s@%s %s %lu %lu :%s", user, host, who, (unsigned long)when, (unsigned long)86400 * 2, reason);
+    send_cmd(ServerName, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who, (long int) when, (long int) 86400 * 2, reason);
 }
 
 void inspircd_cmd_svskill(char *source, char *user, char *buf)
 {
-    if (!buf || !source || !user) {
+    if (!buf) {
         return;
     }
-    send_cmd(CreateSum(),"K %s %s :%s", s_OperServ, user, buf);
+
+    if (!source || !user) {
+        return;
+    }
+
+    send_cmd(source, "KILL %s :%s", user, buf);
 }
 
 void inspircd_cmd_svsmode(User * u, int ac, char **av)
 {
-    send_cmd(CreateSum(), "M %s %s", u->nick, av[0]);
+    send_cmd(s_NickServ, "MODE %s %s%s%s", u->nick, av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
 }
 
 
 void inspircd_cmd_372(char *source, char *msg)
 {
+    send_cmd(ServerName, "372 %s :- %s", source, msg);
 }
 
 void inspircd_cmd_372_error(char *source)
 {
+    send_cmd(ServerName, "422 %s :- MOTD file not found!  Please "
+             "contact your IRC administrator.", source);
 }
 
 void inspircd_cmd_375(char *source)
 {
+    send_cmd(ServerName, "375 %s :- %s Message of the Day",
+             source, ServerName);
 }
 
 void inspircd_cmd_376(char *source)
 {
+    send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
 }
 
 void inspircd_cmd_nick(char *nick, char *name, char *modes)
 {
-    /* N <time> <nick> <host> <displayed-host> <ident> <modes> <ipaddress> <server> :<GECOS> */
-    send_cmd(CreateSum(), "N %lu %s %s %s %s %s 0.0.0.0 %s :%s",(long int) time(NULL),nick,ServiceHost,ServiceHost,ServiceUser,modes,ServerName,name);
+    // :test.chatspike.net NICK 1133519355 Brain synapse.brainbox.winbot.co.uk netadmin.chatspike.net ~brain +xwsioS 10.0.0.2 :Craig Edwards
+    send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s",(long int) time(NULL),nick,ServiceHost,ServiceHost,ServiceUser,modes,name);
+    send_cmd(ServerName, "OPERTYPE Service");
 }
 
 void inspircd_cmd_guest_nick(char *nick, char *user, char *host, char *real,
-                          char *modes)
+                           char *modes)
 {
-    send_cmd(CreateSum(), "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick,
-             (long int) time(NULL), user, host, ServerName, modes, real);
-    send_cmd(CreateSum(), "N %lu %s %s %s %s %s 0.0.0.0 %s :%s",(long int) time(NULL),nick,host,host,user,modes,ServerName,real);
+    send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s",(long int) time(NULL),nick,host,host,user,modes,real);
 }
 
 void inspircd_cmd_mode(char *source, char *dest, char *buf)
@@ -583,21 +582,131 @@ void inspircd_cmd_mode(char *source, char *dest, char *buf)
     if (!buf) {
         return;
     }
-    send_cmd(CreateSum(), "m %s %s %s", source, dest, buf);
+    send_cmd(source ? source : s_OperServ, "MODE %s %s", dest, buf);
+}
+
+int anope_event_version(char *source, int ac, char **av)
+{
+    return MOD_CONT;
+}
+
+int anope_event_idle(char *source, int ac, char **av)
+{
+	if (ac == 1)
+	{
+		send_cmd(av[0],"IDLE %s %ld 0",source,time(NULL));
+	}
+	return MOD_CONT;
+}
+
+int anope_event_ftopic(char *source, int ac, char **av)
+{
+    /* :source FTOPIC channel ts setby :topic */
+    char* temp;
+    if (ac < 4)
+        return MOD_CONT;
+    temp = av[1];  /* temp now holds ts */
+    av[1] = av[2]; /* av[1] now holds set by */
+    av[2] = temp;  /* av[2] now holds ts */
+    do_topic(source, ac, av);
+    return MOD_CONT;
+}
+
+int anope_event_opertype(char* source, int ac, char**av)
+{
+    /* opertype is equivalent to mode +o because servers
+       dont do this directly */
+    char* newav[2];
+    newav[0] = source;
+    newav[1] = "+o";
+    return anope_event_mode(source, 2, newav);
+}
+
+int anope_event_fmode(char *source, int ac, char **av)
+{
+    /* :source FMODE #test +nt */
+    if (ac != 2)
+        return MOD_CONT;
+    return anope_event_mode(source, ac, av);
+}
+
+int anope_event_samode(char *source, int ac, char **av)
+{
+    /* :source SAMODE targets modes */
+    if (ac < 2)
+        return MOD_CONT;
+    return anope_event_mode(source, ac, av);
+    return MOD_CONT;
+}
+
+int anope_event_sanick(char *source, int ac, char **av)
+{
+    /* :source SANICK old new */
+    if (ac != 2)
+        return MOD_CONT;
+    do_nick(av[0], av[1], NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
+    return MOD_CONT;
+}
+
+int anope_event_sajoin(char *source, int ac, char **av)
+{
+    char* newav[1];
+    if (ac != 2)
+        return MOD_CONT;
+    newav[0] = av[1];
+    do_join(av[0], 1, newav);
+    return MOD_CONT;
+}
+
+int anope_event_sapart(char *source, int ac, char **av)
+{
+    char* newav[1];
+    if (ac < 2)
+        return MOD_CONT;
+    newav[0] = av[1];
+    do_part(av[0], 1, newav);
+    return MOD_CONT;
+}
+
+int anope_event_fjoin(char *source, int ac, char **av)
+{
+    char* newav[127];
+    char people[1024];
+    int i = 0;
+
+    if (ac < 3)
+        return MOD_CONT;
+
+    newav[0] = av[1];
+    newav[1] = av[0];
+    newav[2] = "+";
+    newav[3] = people;
+
+    *people = '\0';
+
+    for (i = 2; i < ac; i++)
+    {
+        if (i > 2)
+                strncat(people," ",1024);
+        strncat(people,av[i],1024);
+    }
+    do_sjoin(source, 4, newav);
+    return MOD_CONT;
 }
 
 void inspircd_cmd_bot_nick(char *nick, char *user, char *host, char *real,
-                        char *modes)
+                         char *modes)
 {
-    send_cmd(CreateSum(), "N %lu %s %s %s %s %s 0.0.0.0 %s :%s",(long int) time(NULL),nick,host,host,user,modes,ServerName,real);
+    send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s",(long int) time(NULL),nick,host,host,user,modes,real);
+    send_cmd(ServerName, "OPERTYPE Bot");
 }
 
 void inspircd_cmd_kick(char *source, char *chan, char *user, char *buf)
 {
     if (buf) {
-        send_cmd(CreateSum(), "k %s %s %s :%s", source, user, chan, buf);
+        send_cmd(source, "KICK %s %s :%s", chan, user, buf);
     } else {
-        send_cmd(CreateSum(), "k %s %s %s :", source, user, chan);
+        send_cmd(source, "KICK %s %s :%s", chan, user, user);
     }
 }
 
@@ -607,7 +716,7 @@ void inspircd_cmd_notice_ops(char *source, char *dest, char *buf)
         return;
     }
 
-    send_cmd(CreateSum(), "V %s @%s :%s", source, dest, buf);
+    send_cmd(ServerName, "NOTICE @%s :%s", dest, buf);
 }
 
 
@@ -620,13 +729,13 @@ void inspircd_cmd_notice(char *source, char *dest, char *buf)
     if (UsePrivmsg) {
         inspircd_cmd_privmsg2(source, dest, buf);
     } else {
-        send_cmd(CreateSum(), "V %s %s :%s", source, dest, buf);
+        send_cmd(source, "NOTICE %s :%s", dest, buf);
     }
 }
 
 void inspircd_cmd_notice2(char *source, char *dest, char *msg)
 {
-    send_cmd(CreateSum(), "V %s %s :%s", source, dest, msg);
+    send_cmd(source, "NOTICE %s :%s", dest, msg);
 }
 
 void inspircd_cmd_privmsg(char *source, char *dest, char *buf)
@@ -635,39 +744,22 @@ void inspircd_cmd_privmsg(char *source, char *dest, char *buf)
         return;
     }
 
-    send_cmd(CreateSum(), "P %s %s :%s", source, dest, buf);
+    send_cmd(source, "PRIVMSG %s :%s", dest, buf);
 }
 
 void inspircd_cmd_privmsg2(char *source, char *dest, char *msg)
 {
-    send_cmd(CreateSum(), "P %s %s :%s", source, dest, msg);
+    send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
 void inspircd_cmd_serv_notice(char *source, char *dest, char *msg)
 {
-   if (!uplink)
-   {
-      send_cmd(CreateSum(), "V %s * :%s", source, msg);
-   }
-   else
-   if (!strcmp(dest,uplink))
-   {
-      alog("debug: serv_notice output to %s", dest);
-      send_cmd(CreateSum(), "V %s * :%s", source, msg);
-   }
+    send_cmd(source, "NOTICE $%s :%s", dest, msg);
 }
 
 void inspircd_cmd_serv_privmsg(char *source, char *dest, char *msg)
 {
-   if (!uplink)
-   {
-      send_cmd(CreateSum(), "P %s * :%s", source, msg);
-   }
-   else
-   if (!strcmp(dest,uplink))
-   {
-      send_cmd(CreateSum(), "P %s * :%s", source, msg);
-   }
+    send_cmd(source, "PRIVMSG $%s :%s", dest, msg);
 }
 
 
@@ -678,15 +770,18 @@ void inspircd_cmd_bot_chan_mode(char *nick, char *chan)
 
 void inspircd_cmd_351(char *source)
 {
+    send_cmd(ServerName, "351 %s Anope-%s %s :%s - %s -- %s",
+             source, version_number, ServerName, ircd->name, version_flags,
+             version_build);
 }
 
 /* QUIT */
 void inspircd_cmd_quit(char *source, char *buf)
 {
     if (buf) {
-        send_cmd(CreateSum(), "Q %s :%s", source, buf);
+        send_cmd(source, "QUIT :%s", buf);
     } else {
-        send_cmd(CreateSum(), "QUIT %s :", source);
+        send_cmd(source, "QUIT :Exiting");
     }
 }
 
@@ -695,54 +790,32 @@ void inspircd_cmd_protoctl()
 {
 }
 
+static char currentpass[1024];
+
 /* PASS */
 void inspircd_cmd_pass(char *pass)
 {
+    strncpy(currentpass,pass,1024);
 }
 
-int anope_event_eob(char *source, int ac, char **av)
-{
-	send_cmd(CreateSum(), "/ NickServ");
-	send_cmd(CreateSum(), "v %s Anope-%s %s :%s - %s -- %s", ServerName, version_number, ServerName, ircd->name, version_flags, version_build);
-	return MOD_CONT;
-}
-
-/* SERVER name hop descript */
+/* SERVER services-dev.chatspike.net password 0 :Description here */
 void inspircd_cmd_server(char *servname, int hop, char *descript)
 {
-    if (hop == 0)
-    {
-          send_cmd(CreateSum(), "H %s",servname);
-    }
-    else
-    {
-          char pw[1024];
-          switch (hop)
-          {
-              case 1:
-                 strncpy(pw,RemotePassword,1023);
-              break;
-              case 2:
-                 strncpy(pw,RemotePassword2,1023);
-              break;
-              case 3:
-                 strncpy(pw,RemotePassword3,1023);
-              break;
-          }	
-          send_cmd(CreateSum(), "U %s %s :%s", servname, pw, descript);
-    }
+    send_cmd(ServerName, "SERVER %s %s %d :%s", servname, currentpass, hop, descript);
 }
 
 /* PONG */
 void inspircd_cmd_pong(char *servname, char *who)
 {
-    send_cmd(CreateSum(), "!");
+    send_cmd(servname, "PONG %s", who);
 }
 
 /* JOIN */
+/* Althought inspircd 3.2 does not need the timestamp others do so
+   we get it in the common function call */
 void inspircd_cmd_join(char *user, char *channel, time_t chantime)
 {
-    send_cmd(CreateSum(), "J %s %s", user, channel);
+    send_cmd(user, "JOIN %s", channel);
 }
 
 /* UNSQLINE */
@@ -751,7 +824,7 @@ void inspircd_cmd_unsqline(char *user)
     if (!user) {
         return;
     }
-    send_cmd(CreateSum(), "[ %s %s", user, s_OperServ);
+    send_cmd(s_OperServ, "QLINE %s", user);
 }
 
 /* CHGHOST */
@@ -760,12 +833,16 @@ void inspircd_cmd_chghost(char *nick, char *vhost)
     if (!nick || !vhost) {
         return;
     }
-    send_cmd(CreateSum(), "b %s %s", nick, vhost);
+    send_cmd(s_OperServ,"CHGHOST %s %s", nick, vhost);
 }
 
 /* CHGIDENT */
 void inspircd_cmd_chgident(char *nick, char *vIdent)
 {
+    if (!nick || !vIdent) {
+        return;
+    }
+    send_cmd(s_OperServ, "CHGIDENT %s %s", nick, vIdent);
 }
 
 /* INVITE */
@@ -775,7 +852,7 @@ void inspircd_cmd_invite(char *source, char *chan, char *nick)
         return;
     }
 
-    send_cmd(CreateSum(), "i %s %s %s", source, nick, chan);
+    send_cmd(source, "INVITE %s %s", nick, chan);
 }
 
 /* PART */
@@ -784,77 +861,145 @@ void inspircd_cmd_part(char *nick, char *chan, char *buf)
     if (!nick || !chan) {
         return;
     }
+
     if (buf) {
-        send_cmd(CreateSum(), "L %s %s :%s", nick, chan, buf);
+        send_cmd(nick, "PART %s :%s", chan, buf);
     } else {
-        send_cmd(CreateSum(), "L %s %s :", nick, chan);
+        send_cmd(nick, "PART %s :Leaving", chan);
     }
 }
 
 /* 391 */
 void inspircd_cmd_391(char *source, char *timestr)
 {
+    if (!timestr) {
+        return;
+    }
+    send_cmd(NULL, "391 :%s %s :%s", source, ServerName, timestr);
 }
 
 /* 250 */
 void inspircd_cmd_250(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(NULL, "250 %s", buf);
 }
 
 /* 307 */
 void inspircd_cmd_307(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(ServerName, "307 %s", buf);
 }
 
 /* 311 */
 void inspircd_cmd_311(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(ServerName, "311 %s", buf);
 }
 
 /* 312 */
 void inspircd_cmd_312(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(ServerName, "312 %s", buf);
 }
 
 /* 317 */
 void inspircd_cmd_317(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(ServerName, "317 %s", buf);
 }
 
 /* 219 */
 void inspircd_cmd_219(char *source, 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 inspircd_cmd_401(char *source, char *who)
 {
+    if (!source || !who) {
+        return;
+    }
+    send_cmd(ServerName, "401 %s %s :No such service.", source, who);
 }
 
 /* 318 */
 void inspircd_cmd_318(char *source, char *who)
 {
+    if (!source || !who) {
+        return;
+    }
+
+    send_cmd(ServerName, "318 %s %s :End of /WHOIS list.", source, who);
 }
 
 /* 242 */
 void inspircd_cmd_242(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(NULL, "242 %s", buf);
 }
 
 /* 243 */
 void inspircd_cmd_243(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(NULL, "243 %s", buf);
 }
 
 /* 211 */
 void inspircd_cmd_211(char *buf)
 {
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(NULL, "211 %s", buf);
 }
 
 /* GLOBOPS */
 void inspircd_cmd_global(char *source, char *buf)
 {
-    send_cmd(CreateSum(), "V %s @* :%s", (source ? source : s_OperServ), buf);
+    if (!buf) {
+        return;
+    }
+
+    send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf);
 }
 
 /* SQLINE */
@@ -863,24 +1008,23 @@ void inspircd_cmd_sqline(char *mask, char *reason)
     if (!mask || !reason) {
         return;
     }
-    /* { <mask> <who-set-it> <time-set> <duration> :<reason> */
-    send_cmd(CreateSum(), "{ %s %s %lu 0 :%s", mask, ServerName, (unsigned long)time(NULL), reason);
+
+    send_cmd(ServerName, "ADDLINE Q %s %s %ld 0 :%s", mask, s_OperServ, (long int) time(NULL), reason);
 }
 
 /* SQUIT */
 void inspircd_cmd_squit(char *servname, char *message)
 {
-    if (!servname) {
+    if (!servname || !message) {
         return;
     }
 
-    send_cmd(CreateSum(), "& %s", servname);
+    send_cmd(ServerName, "SQUIT %s :%s", servname, message);
 }
 
 /* SVSO */
 void inspircd_cmd_svso(char *source, char *nick, char *flag)
 {
-    send_cmd(CreateSum(),"M %s %s",nick,flag);
 }
 
 /* NICK <newnick>  */
@@ -890,7 +1034,7 @@ void inspircd_cmd_chg_nick(char *oldnick, char *newnick)
         return;
     }
 
-    send_cmd("n %s %s", oldnick, newnick);
+    send_cmd(oldnick, "NICK %s", newnick);
 }
 
 /* SVSNICK */
@@ -899,7 +1043,7 @@ void inspircd_cmd_svsnick(char *source, char *guest, time_t when)
     if (!source || !guest) {
         return;
     }
-    send_cmd(CreateSum(), "n %s %s", source, guest);
+    send_cmd(s_OperServ, "SANICK %s %s", source, guest);
 }
 
 /* Functions that use serval cmd functions */
@@ -920,120 +1064,117 @@ void inspircd_cmd_connect(int servernum)
     me_server =
         new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
 
-    srand(time(NULL));
-
-    inspircd_cmd_server(ServerName, servernum, ServerDesc);
+    if (servernum == 1) {
+        inspircd_cmd_pass(RemotePassword);
+    }
+    if (servernum == 2) {
+        inspircd_cmd_pass(RemotePassword2);
+    }
+    if (servernum == 3) {
+        inspircd_cmd_pass(RemotePassword3);
+    }
+    inspircd_cmd_server(ServerName, 0, ServerDesc);
+    send_cmd(NULL,"BURST");
+    send_cmd(ServerName, "VERSION :Anope-%s %s :%s - %s -- %s", version_number, ServerName, ircd->name, version_flags, version_build);
 }
 
 /* Events */
 
 int anope_event_ping(char *source, int ac, char **av)
 {
-    inspircd_cmd_pong("", "");
+    if (ac < 1)
+        return MOD_CONT;
+    inspircd_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
     return MOD_CONT;
 }
 
 int anope_event_436(char *source, int ac, char **av)
 {
+    if (ac < 1)
+        return MOD_CONT;
+
+    m_nickcoll(av[0]);
     return MOD_CONT;
 }
 
 int anope_event_away(char *source, int ac, char **av)
 {
+    if (!source) {
+        return MOD_CONT;
+    }
+    m_away(source, (ac ? av[0] : NULL));
     return MOD_CONT;
 }
 
-int anope_event_servertopic(char *source, int ac, char **av)
-{
-    /* T 1115252145 ViaraiX #deck8 :Welcome to Deck8 */
-    char *v[32];
-    if (ac != 4)
-       return MOD_CONT;
-    v[0] = av[2];
-    v[1] = av[1];
-    v[2] = av[0];
-    v[3] = av[3];
-    do_topic(NULL, 4, v); /* no source (server set) */
-    return MOD_CONT;
-}
+/* Taken from hybrid.c, topic syntax is identical */
 
 int anope_event_topic(char *source, int ac, char **av)
 {
-    /* t [Brain] #chatspike :this is a topic test fsfdsfsdfds */
-    char *v[32];
-    if (ac != 3)
+    Channel *c = findchan(av[0]);
+    time_t topic_time = time(NULL);
+
+    if (!c) {
+        if (debug) {
+            alog("debug: TOPIC %s for nonexistent channel %s",
+                 merge_args(ac - 1, av + 1), av[0]);
+        }
         return MOD_CONT;
-    v[0] = av[1];
-    v[1] = av[0];
-    v[2] = "0";
-    v[3] = av[2];
-    do_topic(av[0], 4, v);
-    return MOD_CONT;
-}
+    }
 
-int anope_event_squit(char *source, int ac, char **av)
-{
-    char *v[32];
-    if (ac != 1)
+    if (check_topiclock(c, topic_time))
         return MOD_CONT;
-    v[0] = av[1];
-    do_squit(av[1], 1, v);
+
+    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_quit(char *source, int ac, char **av)
+int anope_event_squit(char *source, int ac, char **av)
 {
-    char *v[32];
     if (ac != 2)
         return MOD_CONT;
-    v[0] = av[1];
-    v[1] = av[2];
-    do_quit(av[0], 2, v);
+    do_squit(source, ac, av);
     return MOD_CONT;
 }
 
-int anope_event_servermode(char *source, int ac, char **av)
+int anope_event_quit(char *source, int ac, char **av)
 {
-    char* v[32];
-    Channel* c;
-    int i = 0;
-
-    if (*av[0] == '#')
-    {
-	    c = findchan(av[0]);
-            for (i = 1; i < ac; i++)
-                v[i-1] = av[i];
-	    if (c)
-	    {
-	    	chan_set_modes(s_OperServ, c, ac-1, v, 1);
-	    }
-    }
-    else
-    {
-	    v[0] = av[0];
-	    for (i = 0; i < ac; i++)
-	       	v[i+1] = av[i];
-	    anope_event_mode(av[0], ac+1, v);
-    }
+    if (ac != 1)
+        return MOD_CONT;
+    do_quit(source, ac, av);
     return MOD_CONT;
 }
 
 
 int anope_event_mode(char *source, int ac, char **av)
 {
-    char *v[32];
-    int i;
-    if (ac < 3)
+    if (ac < 2)
         return MOD_CONT;
 
-    for (i = 1; i < ac; i++)
-    {
-        v[i-1] = av[i];
-    }
-    if (*av[1] == '#') {
-        do_cmode(av[1], ac-1, v);
+    if (*av[0] == '#' || *av[0] == '&') {
+        do_cmode(source, ac, av);
     } else {
-        do_umode(av[0], ac-1, v);
+	/* InspIRCd lets opers change another
+           users modes, we have to kludge this
+           as it slightly breaks RFC1459
+         */
+	if (!strcasecmp(source,av[0]))
+	{
+        	do_umode(source, ac, av);
+	}
+	else
+	{
+		do_umode(av[0], ac, av);
+	}
     }
     return MOD_CONT;
 }
@@ -1041,87 +1182,37 @@ int anope_event_mode(char *source, int ac, char **av)
 
 int anope_event_kill(char *source, int ac, char **av)
 {
-    if (ac != 3)
+    if (ac != 2)
         return MOD_CONT;
-    m_kill(av[1], av[2]);
+
+    m_kill(av[0], av[1]);
     return MOD_CONT;
 }
 
 int anope_event_kick(char *source, int ac, char **av)
 {
-    /* Syntax: k <source> <dest> <channel> :<reason> */
-    char *v[32];
-    if (ac != 4)
-        return MOD_CONT;    v[0] = av[1];
-    v[1] = av[2];
-    v[2] = av[3];
-    do_kick(av[0], 3, v);
+    if (ac != 3)
+        return MOD_CONT;
+    do_kick(source, ac, av);
     return MOD_CONT;
 }
 
 
 int anope_event_join(char *source, int ac, char **av)
 {
-    User *u;
-    Channel *c;
-    int i;
-    char* new_av[32];
-    char* cumodes[3];
-    char thismodes[256];
-    cumodes[0] = thismodes;
-
-    /* some sanity checks */
-    if (ac < 2) {
-            return MOD_CONT;
-    }
-
-    u = finduser(av[0]); /* get the user info */
-
-    if (!u) {
+    if (ac != 1)
         return MOD_CONT;
-    }
-
-    cumodes[1] = av[0];
-
-    /* iterate through each channel the user is joining */
-    for (i = 1; i < ac; i++)
-    {
-            /* the channel name */
-            new_av[0] = av[i];
-
-            /* strip off the permissions */
-            strcpy(thismodes,"");
-            if (*new_av[0] != '#')
-            {
-		    switch (*new_av[0])
-		    {
-			case '@':
-				strcpy(thismodes,"+o");
-			break;
-			case '%':
-				strcpy(thismodes,"+h");
-			break;
-			case '+':
-				strcpy(thismodes,"+v");
-			break;
-		    }
-                    new_av[0]++;
-            }
-
-            do_join(av[0], 1, new_av);
-            c = findchan(new_av[0]);
-            if ((c) && (strcmp(thismodes,"")))
-            {
-                    chan_set_modes(av[0], c, 2, cumodes, 1);
-            }
-    }
-
+    do_join(source, ac, av);
     return MOD_CONT;
-
 }
 
 int anope_event_motd(char *source, int ac, char **av)
 {
+    if (!source) {
+        return MOD_CONT;
+    }
+
+    m_motd(source);
     return MOD_CONT;
 }
 
@@ -1129,17 +1220,18 @@ int anope_event_setname(char *source, int ac, char **av)
 {
     User *u;
 
-    if (ac != 2)
+    if (ac != 1)
         return MOD_CONT;
 
-    u = finduser(av[0]);
+    u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
-    change_user_realname(u, av[1]);
+
+    change_user_realname(u, av[0]);
     return MOD_CONT;
 }
 
@@ -1150,24 +1242,52 @@ int anope_event_chgname(char *source, int ac, char **av)
     if (ac != 2)
         return MOD_CONT;
 
-    u = finduser(av[0]);
+    u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: FNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
 
-    change_user_realname(u, av[1]);
+    change_user_realname(u, av[0]);
     return MOD_CONT;
 }
 
 int anope_event_setident(char *source, int ac, 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;
+    }
+
+    change_user_username(u, av[0]);
     return MOD_CONT;
 }
 int anope_event_chgident(char *source, int ac, 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;
+    }
+
+    change_user_username(u, av[1]);
     return MOD_CONT;
 }
 
@@ -1175,48 +1295,47 @@ int anope_event_sethost(char *source, int ac, char **av)
 {
     User *u;
 
-    if (ac != 2)
+    if (ac != 1)
         return MOD_CONT;
 
-    u = finduser(av[0]);
+    u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
-    change_user_host(u, av[1]);
+
+    change_user_host(u, av[0]);
     return MOD_CONT;
 }
 
+
 int anope_event_nick(char *source, int ac, char **av)
 {
     User *user;
     struct in_addr addy;
     uint32* ad = (uint32*)&addy;
 
-/* someone really should comment this -- Brain
-
- User *do_nick(const char *source, char *nick, char *username, char *host,
-              char *server, char *realname, time_t ts, uint32 svid,
-              uint32 ip, char *vhost, char *uid)
-
- Syntax: N <time> <nick> <host> <displayed-host> <ident> <modes> <ipaddress> <server> :<GECOS>
-*/
-    if (ac == 9) {
-/*	 fix by brain - 27 apr 2005
-	 During a net merge between two meshed clients there may be some spurious "bouncing"
-	 nick introductions (e.g. introductions for clients we already have). If this happens,
-	 we should ignore any that claim to be from us as these are just confirmations of the
-	 services "complement" - processing them will cause all kinds of session limit oddities.*/
-	if ((strcmp(av[7],ServerName)) && (!finduser(av[1])))
-	{
-	        inet_aton(av[6],&addy);
-	        user = do_nick("", av[1], av[4], av[2], uplink, av[8],
-	               strtoul(av[0], NULL, 10), 0, htonl(*ad), av[3], NULL);
-	        if (user)
+    if (ac != 1) {
+        if (ac == 8) {
+            inet_aton(av[6],&addy);
+            user = do_nick("",	 	av[1],	// nick
+					av[4],	// username
+					av[2],	// realhost
+					source, // server
+					av[7],	// realname
+					strtoul(av[0], NULL, 10),
+					0,
+					htonl(*ad),
+					av[3],
+					NULL);
+             if (user)
 	            anope_set_umode(user, 1, &av[5]);
-	}
+        }
+    } else {
+        do_nick(source, av[0], NULL, NULL, NULL, NULL,
+                0, 0, 0, NULL, NULL);
     }
     return MOD_CONT;
 }
@@ -1229,58 +1348,50 @@ int anope_event_chghost(char *source, int ac, char **av)
     if (ac != 2)
         return MOD_CONT;
 
-    u = finduser(av[0]);
+    u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: FHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
 
-    change_user_host(u, av[1]);
+    change_user_host(u, av[0]);
     return MOD_CONT;
 }
 
-
-
 /* EVENT: SERVER */
 int anope_event_server(char *source, int ac, char **av)
 {
-    /*
-     to shield anope from the intricacies of the mesh,
-     anope only sees the uplink at all times (and receives
-     all nick introductions etc as if they'd come from the
-     uplink directly, 1 hop away. */
-    if (!uplink)
-    {
-	    uplink = sstrdup(av[0]);
-	    do_server(source, av[0], av[1], av[3], NULL);
+    if (!stricmp(av[1], "1")) {
+        uplink = sstrdup(av[0]);
     }
+    do_server(source, av[0], av[1], av[2], NULL);
     return MOD_CONT;
 }
 
 
 int anope_event_privmsg(char *source, int ac, char **av)
 {
-    if (ac != 3)
+    if (ac != 2)
         return MOD_CONT;
-    m_privmsg(av[0], av[1], av[2]);
+    m_privmsg(source, av[0], av[1]);
     return MOD_CONT;
 }
 
 int anope_event_part(char *source, int ac, char **av)
 {
-    char *v[32];
-    if (ac != 3)
+    if (ac < 1 || ac > 2)
         return MOD_CONT;
-    v[0] = av[1]; /* channel */
-    v[1] = av[2]; /* reason */
-    do_part(av[0], 2, v);
+    do_part(source, ac, av);
     return MOD_CONT;
 }
 
 int anope_event_whois(char *source, int ac, char **av)
 {
+    if (source && ac >= 1) {
+        m_whois(source, av[0]);
+    }
     return MOD_CONT;
 }
 
@@ -1305,15 +1416,13 @@ void inspircd_cmd_unsgline(char *mask)
 /* UNSZLINE */
 void inspircd_cmd_unszline(char *mask)
 {
-    /* ] <mask> <who> */
-    send_cmd(CreateSum(), "] %s %s", mask, s_OperServ);
+    send_cmd(s_OperServ, "ZLINE %s", mask);
 }
 
 /* SZLINE */
 void inspircd_cmd_szline(char *mask, char *reason, char *whom)
 {
-    /* } <mask> <who-set-it> <time-set> <duration> :<reason> */
-    send_cmd(CreateSum(), "} %s %s %lu %lu :%s",mask,whom,(unsigned long)time(NULL),(unsigned long)86400 * 2, reason);
+    send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, (long int) time(NULL), reason);
 }
 
 /* SGLINE */
@@ -1339,20 +1448,25 @@ void inspircd_cmd_svsmode_chan(char *name, char *mode, char *nick)
 /* sent if svid is something weird */
 void inspircd_cmd_svid_umode(char *nick, time_t ts)
 {
-    /* Not supported by this IRCD */
+    if (debug)
+        alog("debug: common_svsmode(0)");
 }
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
 void inspircd_cmd_nc_change(User * u)
 {
-    common_svsmode(u, "-r", "1");
+    if (debug)
+        alog("debug: common_svsmode(1)");
+    common_svsmode(u, "-r", NULL);
 }
 
 /* SVSMODE +r */
 void inspircd_cmd_svid_umode2(User * u, char *ts)
 {
-    send_cmd(CreateSum(),"m %s %s +r",s_OperServ,u->nick);
+   if (debug)
+       alog("debug: common_svsmode(2)");
+   common_svsmode(u, "+r", NULL);
 }
 
 void inspircd_cmd_svid_umode3(User * u, char *ts)
@@ -1362,22 +1476,21 @@ void inspircd_cmd_svid_umode3(User * u, char *ts)
 
 void inspircd_cmd_svsjoin(char *source, char *nick, char *chan)
 {
-    send_cmd(source, "J %s %s", nick, chan);
+    send_cmd(source, "SAJOIN %s %s", nick, chan);
 }
 
 void inspircd_cmd_svspart(char *source, char *nick, char *chan)
 {
-    send_cmd(source, "L %s %s :", nick, chan);
+    send_cmd(source, "SAPART %s %s", nick, chan);
 }
 
 void inspircd_cmd_swhois(char *source, char *who, char *mask)
 {
-    /* Not supported at U type server */
 }
 
 void inspircd_cmd_eob()
 {
-    /* Not implemented in this version of inspircd.c */
+    send_cmd(NULL,"ENDBURST");
 }
 
 
@@ -1398,37 +1511,53 @@ int anope_event_admin(char *source, int ac, char **av)
 
 int inspircd_flood_mode_check(char *value)
 {
-    /* no +f mode! */
-    return 1;
+    char *dp, *end;
+
+    if (value && *value != ':'
+        && (strtoul((*value == '*' ? value + 1 : value), &dp, 10) > 0)
+        && (*dp == ':') && (*(++dp) != 0) && (strtoul(dp, &end, 10) > 0)
+        && (*end == 0)) {
+        return 1;
+    } else {
+        return 0;
+    }
 }
 
 void inspircd_cmd_jupe(char *jserver, char *who, char *reason)
 {
-    send_cmd(CreateSum(), "_ %s :%s",jserver,reason);
+    char rbuf[256];
+
+    snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
+             reason ? ": " : "", reason ? reason : "");
+
+    inspircd_cmd_squit(jserver, rbuf);
+    inspircd_cmd_server(jserver, 1, rbuf);
+    new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
 
 /* GLOBOPS - to handle old WALLOPS */
 void inspircd_cmd_global_legacy(char *source, char *fmt)
 {
-    send_cmd(CreateSum(), "@ %s :%s", source ? source : ServerName, fmt);
+    send_cmd(source ? source : s_OperServ, "GLOBOPS :%s", fmt);
 }
 
 int inspircd_valid_nick(char *nick)
 {
-    /* no special nicks */
     return 1;
 }
 
 void inspircd_cmd_ctcp(char *source, char *dest, char *buf)
 {
     char *s;
+
     if (!buf) {
         return;
     } else {
         s = normalizeBuffer(buf);
-        send_cmd(CreateSum(), "V %s %s :\1%s \1", source, dest, s);
-        free(s);
     }
+
+    send_cmd(source, "NOTICE %s :\1%s\1", dest, s);
+    free(s);
 }
 
 
@@ -1436,8 +1565,8 @@ void inspircd_cmd_ctcp(char *source, char *dest, char *buf)
  * Tell anope which function we want to perform each task inside of anope.
  * These prototypes must match what anope expects.
  **/
-void moduleAddAnopeCmds() {
-	pmodule_set_mod_current_buffer(inspircd_set_mod_current_buffer);
+void moduleAddAnopeCmds()
+{
     pmodule_cmd_svsnoop(inspircd_cmd_svsnoop);
     pmodule_cmd_remove_akill(inspircd_cmd_remove_akill);
     pmodule_cmd_topic(inspircd_cmd_topic);
@@ -1513,36 +1642,36 @@ void moduleAddAnopeCmds() {
 /** 
  * Now tell anope how to use us.
  **/
-int AnopeInit(int argc, char **argv) {
-
-	moduleAddAuthor("Brain");
-        moduleAddVersion("$Id$");
-        moduleSetType(PROTOCOL);
-
-        pmodule_ircd_version("InspIRCd 1.0 Beta3");
-        pmodule_ircd_cap(myIrcdcap);
-        pmodule_ircd_var(myIrcd);
-        pmodule_ircd_cbmodeinfos(myCbmodeinfos);
-        pmodule_ircd_cumodes(myCumodes);
-        pmodule_ircd_flood_mode_char_set("+f");
-        pmodule_ircd_flood_mode_char_remove("-f");
-        pmodule_ircd_cbmodes(myCbmodes);
-        pmodule_ircd_cmmodes(myCmmodes);
-        pmodule_ircd_csmodes(myCsmodes);
-	pmodule_ircd_useTSMode(0);
-
-	/** Deal with modes anope _needs_ to know **/
-	pmodule_invis_umode(UMODE_i);
-	pmodule_oper_umode(UMODE_o);
-	pmodule_invite_cmode(CMODE_i);
-	pmodule_secret_cmode(CMODE_s);
-	pmodule_private_cmode(CMODE_p);
-	pmodule_key_mode(CMODE_k);
-	pmodule_limit_mode(CMODE_l);
+int AnopeInit(int argc, char **argv)
+{
+
+    moduleAddAuthor("Anope");
+    moduleAddVersion("$Id$");
+    moduleSetType(PROTOCOL);
+
+    pmodule_ircd_version("inspircdIRCd Beta 6+");
+    pmodule_ircd_cap(myIrcdcap);
+    pmodule_ircd_var(myIrcd);
+    pmodule_ircd_cbmodeinfos(myCbmodeinfos);
+    pmodule_ircd_cumodes(myCumodes);
+    pmodule_ircd_flood_mode_char_set("+f");
+    pmodule_ircd_flood_mode_char_remove("-f");
+    pmodule_ircd_cbmodes(myCbmodes);
+    pmodule_ircd_cmmodes(myCmmodes);
+    pmodule_ircd_csmodes(myCsmodes);
+    pmodule_ircd_useTSMode(0);
+
+        /** Deal with modes anope _needs_ to know **/
+    pmodule_invis_umode(UMODE_i);
+    pmodule_oper_umode(UMODE_o);
+    pmodule_invite_cmode(CMODE_i);
+    pmodule_secret_cmode(CMODE_s);
+    pmodule_private_cmode(CMODE_p);
+    pmodule_key_mode(CMODE_k);
+    pmodule_limit_mode(CMODE_l);
 
     moduleAddAnopeCmds();
     moduleAddIRCDMsgs();
 
     return MOD_CONT;
 }
-
diff --git a/src/protocol/inspircd.h b/src/protocol/inspircd.h
index a7aa01e4c..e9894e3da 100644
--- a/src/protocol/inspircd.h
+++ b/src/protocol/inspircd.h
@@ -1,4 +1,4 @@
-/* InspIRCd 1.0 beta functions
+/* inspircd beta 6 functions
  *
  * (C) 2003-2005 Anope Team
  * Contact us at info@anope.org
@@ -121,4 +121,13 @@ int inspircd_flood_mode_check(char *value);
 void inspircd_cmd_jupe(char *jserver, char *who, char *reason);
 int inspircd_valid_nick(char *nick);
 void inspircd_cmd_ctcp(char *source, char *dest, char *buf);
-
+int anope_event_fjoin(char *source, int ac, char **av);
+int anope_event_fmode(char *source, int ac, char **av);
+int anope_event_ftopic(char *source, int ac, char **av);
+int anope_event_sanick(char *source, int ac, char **av);
+int anope_event_samode(char *source, int ac, char **av);
+int anope_event_sajoin(char *source, int ac, char **av);
+int anope_event_sapart(char *source, int ac, char **av);
+int anope_event_version(char *source, int ac, char **av);
+int anope_event_opertype(char *source, int ac, char **av);
+int anope_event_idle(char* source, int ac, char **av);