Added cmd_join() function to IRCDProtoNew class.

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

11 files changed, 19 insertions, 39 deletions

diff --git a/src/ircd.c b/src/ircd.c
index d1682f029..a33dea4e7 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -51,7 +51,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_375 = NULL;
     ircdproto.ircd_cmd_376 = NULL;
     ircdproto.ircd_cmd_351 = NULL;
-    ircdproto.ircd_cmd_join = NULL;
     ircdproto.ircd_cmd_unsqline = NULL;
     ircdproto.ircd_cmd_invite = NULL;
     ircdproto.ircd_cmd_part = NULL;
@@ -310,7 +309,7 @@ void anope_cmd_pong(const char *servname, const char *who)
 
 void anope_cmd_join(const char *user, const char *channel, time_t chantime)
 {
-    ircdproto.ircd_cmd_join(user, channel, chantime);
+	ircdprotonew->cmd_join(user, channel, chantime);
 }
 
 void anope_cmd_unsqline(const char *user)
@@ -660,12 +659,6 @@ void pmodule_cmd_351(void (*func) (const char *source))
     ircdproto.ircd_cmd_351 = func;
 }
 
-void
-pmodule_cmd_join(void (*func) (const char *user, const char *channel, time_t chantime))
-{
-    ircdproto.ircd_cmd_join = func;
-}
-
 void pmodule_cmd_unsqline(void (*func) (const char *user))
 {
     ircdproto.ircd_cmd_unsqline = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 9da48a827..ea8d71aad 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -771,9 +771,9 @@ void bahamut_cmd_unsqline(const char *user)
 }
 
 /* JOIN - SJOIN */
-void bahamut_cmd_join(const char *user, const char *channel, time_t chantime)
+void BahamutIRCdProto::cmd_join(const char *user, const char *channel, time_t chantime)
 {
-    send_cmd(user, "SJOIN %ld %s", (long int) chantime, channel);
+	send_cmd(user, "SJOIN %ld %s", static_cast<long>(chantime), channel);
 }
 
 void bahamut_cmd_burst()
@@ -1473,7 +1473,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(bahamut_cmd_375);
     pmodule_cmd_376(bahamut_cmd_376);
     pmodule_cmd_351(bahamut_cmd_351);
-    pmodule_cmd_join(bahamut_cmd_join);
     pmodule_cmd_unsqline(bahamut_cmd_unsqline);
     pmodule_cmd_invite(bahamut_cmd_invite);
     pmodule_cmd_part(bahamut_cmd_part);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index e6e7f8da6..c0a39b79d 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -64,7 +64,6 @@ void bahamut_cmd_372_error(const char *source);
 void bahamut_cmd_375(const char *source);
 void bahamut_cmd_376(const char *source);
 void bahamut_cmd_351(const char *source);
-void bahamut_cmd_join(const char *user, const char *channel, time_t chantime);
 void bahamut_cmd_unsqline(const char *user);
 void bahamut_cmd_invite(const char *source, const char *chan, const char *nick);
 void bahamut_cmd_part(const char *nick, const char *chan, const char *buf);
@@ -121,4 +120,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
+		void cmd_join(const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 10c53bec4..722856133 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -825,13 +825,10 @@ void charybdis_cmd_unsqline(const char *user)
              "UNRESV * %s", user);
 }
 
-void charybdis_cmd_join(const char *user, const char *channel, time_t chantime)
+void CharybdisProto::cmd_join(const char *user, const char *channel, time_t chantime)
 {
-    Uid *ud;
-
-    ud = find_uid(user);
-    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime,
-             channel, (UseTS6 ? (ud ? ud->uid : user) : user));
+	Uid *ud = find_uid(user);
+	send_cmd(NULL, "SJOIN %ld %s + :%s", static_cast<long>(chantime), channel, UseTS6 ? (ud ? ud->uid : user) : user);
 }
 
 /*
@@ -1729,7 +1726,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(charybdis_cmd_375);
     pmodule_cmd_376(charybdis_cmd_376);
     pmodule_cmd_351(charybdis_cmd_351);
-    pmodule_cmd_join(charybdis_cmd_join);
     pmodule_cmd_unsqline(charybdis_cmd_unsqline);
     pmodule_cmd_invite(charybdis_cmd_invite);
     pmodule_cmd_part(charybdis_cmd_part);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 480f93726..4588a81d8 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -52,7 +52,6 @@ void charybdis_cmd_372_error(const char *source);
 void charybdis_cmd_375(const char *source);
 void charybdis_cmd_376(const char *source);
 void charybdis_cmd_351(const char *source);
-void charybdis_cmd_join(const char *user, const char *channel, time_t chantime);
 void charybdis_cmd_unsqline(const char *user);
 void charybdis_cmd_invite(const char *source, const char *chan, const char *nick);
 void charybdis_cmd_part(const char *nick, const char *chan, const char *buf);
@@ -113,4 +112,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_quit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
+		void cmd_join(const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index b01d8febf..f5a483de9 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -813,9 +813,9 @@ void inspircd_cmd_server(const char *servname, int hop, const char *descript)
 }
 
 /* JOIN */
-void inspircd_cmd_join(const char *user, const char *channel, time_t chantime)
+void InspIRCdProto::cmd_join(const char *user, const char *channel, time_t chantime)
 {
-    send_cmd(user, "JOIN %s", channel);
+	send_cmd(user, "JOIN %s", channel);
 }
 
 /* UNSQLINE */
@@ -1719,7 +1719,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(inspircd_cmd_375);
     pmodule_cmd_376(inspircd_cmd_376);
     pmodule_cmd_351(inspircd_cmd_351);
-    pmodule_cmd_join(inspircd_cmd_join);
     pmodule_cmd_unsqline(inspircd_cmd_unsqline);
     pmodule_cmd_invite(inspircd_cmd_invite);
     pmodule_cmd_part(inspircd_cmd_part);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 44677c97e..a0f7b4c9b 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -57,7 +57,6 @@ void inspircd_cmd_372_error(const char *source);
 void inspircd_cmd_375(const char *source);
 void inspircd_cmd_376(const char *source);
 void inspircd_cmd_351(const char *source);
-void inspircd_cmd_join(const char *user, const char *channel, time_t chantime);
 void inspircd_cmd_unsqline(const char *user);
 void inspircd_cmd_invite(const char *source, const char *chan, const char *nick);
 void inspircd_cmd_part(const char *nick, const char *chan, const char *buf);
@@ -125,4 +124,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
+		void cmd_join(const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 911f1863a..85bec0ccd 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -767,13 +767,10 @@ void ratbox_cmd_unsqline(const char *user)
              "UNRESV * %s", user);
 }
 
-void ratbox_cmd_join(const char *user, const char *channel, time_t chantime)
+void RatboxProto::cmd_join(const char *user, const char *channel, time_t chantime)
 {
-    Uid *ud;
-
-    ud = find_uid(user);
-    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime,
-             channel, (UseTS6 ? (ud ? ud->uid : user) : user));
+	Uid *ud = find_uid(user);
+	send_cmd(NULL, "SJOIN %ld %s + :%s", static_cast<long>(chantime), channel, UseTS6 ? (ud ? ud->uid : user) : user);
 }
 
 /*
@@ -1623,7 +1620,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(ratbox_cmd_375);
     pmodule_cmd_376(ratbox_cmd_376);
     pmodule_cmd_351(ratbox_cmd_351);
-    pmodule_cmd_join(ratbox_cmd_join);
     pmodule_cmd_unsqline(ratbox_cmd_unsqline);
     pmodule_cmd_invite(ratbox_cmd_invite);
     pmodule_cmd_part(ratbox_cmd_part);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 568647ce2..48f3ee4c4 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -51,7 +51,6 @@ void ratbox_cmd_372_error(const char *source);
 void ratbox_cmd_375(const char *source);
 void ratbox_cmd_376(const char *source);
 void ratbox_cmd_351(const char *source);
-void ratbox_cmd_join(const char *user, const char *channel, time_t chantime);
 void ratbox_cmd_unsqline(const char *user);
 void ratbox_cmd_invite(const char *source, const char *chan, const char *nick);
 void ratbox_cmd_part(const char *nick, const char *chan, const char *buf);
@@ -111,4 +110,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_quit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
+		void cmd_join(const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index d1104d445..d68a7184d 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -697,12 +697,10 @@ void unreal_cmd_server(const char *servname, int hop, const char *descript)
 }
 
 /* JOIN */
-void unreal_cmd_join(const char *user, const char *channel, time_t chantime)
+void UnrealIRCdProto::cmd_join(const char *user, const char *channel, time_t chantime)
 {
-    send_cmd(ServerName, "%s !%s %s :%s",
-             send_token("SJOIN", "~"), base64enc((long int) chantime),
-             channel, user);
-    /* send_cmd(user, "%s %s", send_token("JOIN", "C"), channel); */
+	send_cmd(ServerName, "%s !%s %s :%s", send_token("SJOIN", "~"), base64enc(static_cast<long>(chantime)), channel, user);
+	/* send_cmd(user, "%s %s", send_token("JOIN", "C"), channel); */
 }
 
 /* unsqline
@@ -2020,7 +2018,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(unreal_cmd_375);
     pmodule_cmd_376(unreal_cmd_376);
     pmodule_cmd_351(unreal_cmd_351);
-    pmodule_cmd_join(unreal_cmd_join);
     pmodule_cmd_unsqline(unreal_cmd_unsqline);
     pmodule_cmd_invite(unreal_cmd_invite);
     pmodule_cmd_part(unreal_cmd_part);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 905082ef3..4621d95b5 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -86,7 +86,6 @@ void unreal_cmd_372_error(const char *source);
 void unreal_cmd_375(const char *source);
 void unreal_cmd_376(const char *source);
 void unreal_cmd_351(const char *source);
-void unreal_cmd_join(const char *user, const char *channel, time_t chantime);
 void unreal_cmd_unsqline(const char *user);
 void unreal_cmd_invite(const char *source, const char *chan, const char *nick);
 void unreal_cmd_part(const char *nick, const char *chan, const char *buf);
@@ -144,4 +143,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
+		void cmd_join(const char *, const char *, time_t);
 } ircd_proto;