Added cmd_svsjoin() function to IRCDProtoNew class.

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

8 files changed, 8 insertions, 37 deletions

diff --git a/src/ircd.c b/src/ircd.c
index de304e485..cceb57e14 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,7 +63,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_242 = NULL;
     ircdproto.ircd_cmd_243 = NULL;
     ircdproto.ircd_cmd_211 = NULL;
-    ircdproto.ircd_cmd_svsjoin = NULL;
     ircdproto.ircd_cmd_svspart = NULL;
     ircdproto.ircd_cmd_swhois = NULL;
     ircdproto.ircd_cmd_eob = NULL;
@@ -544,7 +543,7 @@ void anope_cmd_svid_umode3(User *u, const char *ts)
 
 void anope_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
 {
-    ircdproto.ircd_cmd_svsjoin(source, nick, chan, param);
+	ircdprotonew->cmd_svsjoin(source, nick, chan, param);
 }
 
 void anope_cmd_svspart(const char *source, const char *nick, const char *chan)
@@ -691,13 +690,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_svsjoin(void (*func)
-                          (const char *source, const char *nick, const char *chan,
-                           const char *param))
-{
-    ircdproto.ircd_cmd_svsjoin = func;
-}
-
 void
 pmodule_cmd_svspart(void (*func) (const char *source, const char *nick, const char *chan))
 {
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 87ca850d8..2af499dfb 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1230,11 +1230,6 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void bahamut_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
-{
-    /* Can not find any reference to these in Bahamut */
-}
-
 void bahamut_cmd_svspart(const char *source, const char *nick, const char *chan)
 {
     /* Can not find any reference to these in Bahamut */
@@ -1368,7 +1363,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_svsjoin(bahamut_cmd_svsjoin);
     pmodule_cmd_svspart(bahamut_cmd_svspart);
     pmodule_cmd_swhois(bahamut_cmd_swhois);
     pmodule_cmd_eob(bahamut_cmd_eob);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 7e2800637..72b62a4ad 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1437,11 +1437,6 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void charybdis_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
-{
-    /* Not Supported by this IRCD */
-}
-
 void charybdis_cmd_svspart(const char *source, const char *nick, const char *chan)
 {
     /* Not Supported by this IRCD */
@@ -1603,7 +1598,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_svsjoin(charybdis_cmd_svsjoin);
     pmodule_cmd_svspart(charybdis_cmd_svspart);
     pmodule_cmd_swhois(charybdis_cmd_swhois);
     pmodule_cmd_eob(charybdis_cmd_eob);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 511a1dee1..64524fe5b 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1492,9 +1492,9 @@ void InspIRCdProto::cmd_svid_umode2(User *u, const char *ts)
 	common_svsmode(u, "+r", NULL);
 }
 
-void inspircd_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void InspIRCdProto::cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
 {
-    	send_cmd(source, "SVSJOIN %s %s", nick, chan);
+	send_cmd(source, "SVSJOIN %s %s", nick, chan);
 }
 
 void inspircd_cmd_svspart(const char *source, const char *nick, const char *chan)
@@ -1589,7 +1589,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_svsjoin(inspircd_cmd_svsjoin);
     pmodule_cmd_svspart(inspircd_cmd_svspart);
     pmodule_cmd_swhois(inspircd_cmd_swhois);
     pmodule_cmd_eob(inspircd_cmd_eob);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 19abfad0a..8ed804b43 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -112,4 +112,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_szline(const char *, const char *, const char *);
 		void cmd_nc_change(User *);
 		void cmd_svid_umode2(User *, const char *);
+		void cmd_svsjoin(const char *, const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 680e0c49f..2f927ebcf 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1343,11 +1343,6 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void ratbox_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
-{
-    /* Not Supported by this IRCD */
-}
-
 void ratbox_cmd_svspart(const char *source, const char *nick, const char *chan)
 {
     /* Not Supported by this IRCD */
@@ -1480,7 +1475,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_svsjoin(ratbox_cmd_svsjoin);
     pmodule_cmd_svspart(ratbox_cmd_svspart);
     pmodule_cmd_swhois(ratbox_cmd_swhois);
     pmodule_cmd_eob(ratbox_cmd_eob);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index baf645473..ce730bcb3 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1453,13 +1453,10 @@ int anope_event_smo(const char *source, int ac, const char **av)
 /* In older Unreal SVSJOIN and SVSNLINE tokens were mixed so SVSJOIN and SVSNLINE are broken
    when coming from a none TOKEN'd server
 */
-void unreal_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void UnrealIRCdProto::cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
 {
-    if (param) {
-        send_cmd(source, "%s %s %s :%s", send_token("SVSJOIN", "BX"), nick, chan, param);
-    } else {
-        send_cmd(source, "%s %s :%s", send_token("SVSJOIN", "BX"), nick, chan);
-    }
+	if (param) send_cmd(source, "%s %s %s :%s", send_token("SVSJOIN", "BX"), nick, chan, param);
+	else send_cmd(source, "%s %s :%s", send_token("SVSJOIN", "BX"), nick, chan);
 }
 
 /* svspart
@@ -1903,7 +1900,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-	pmodule_cmd_svsjoin(unreal_cmd_svsjoin);
 	pmodule_cmd_svspart(unreal_cmd_svspart);
 	pmodule_cmd_swhois(unreal_cmd_swhois);
     pmodule_cmd_eob(unreal_cmd_eob);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 96a6664c0..ca413ccaa 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -137,4 +137,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_svid_umode(const char *, time_t);
 		void cmd_nc_change(User *);
 		void cmd_svid_umode2(User *, const char *);
+		void cmd_svsjoin(const char *, const char *, const char *, const char *);
 } ircd_proto;