Added cmd_unsqline() function to IRCDProtoNew class.

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

11 files changed, 21 insertions, 42 deletions

diff --git a/src/ircd.c b/src/ircd.c
index a33dea4e7..bdc2646ae 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_unsqline = NULL;
     ircdproto.ircd_cmd_invite = NULL;
     ircdproto.ircd_cmd_part = NULL;
     ircdproto.ircd_cmd_391 = NULL;
@@ -314,7 +313,7 @@ void anope_cmd_join(const char *user, const char *channel, time_t chantime)
 
 void anope_cmd_unsqline(const char *user)
 {
-    ircdproto.ircd_cmd_unsqline(user);
+	ircdprotonew->cmd_unsqline(user);
 }
 
 void anope_cmd_invite(const char *source, const char *chan, const char *nick)
@@ -659,11 +658,6 @@ void pmodule_cmd_351(void (*func) (const char *source))
     ircdproto.ircd_cmd_351 = func;
 }
 
-void pmodule_cmd_unsqline(void (*func) (const char *user))
-{
-    ircdproto.ircd_cmd_unsqline = func;
-}
-
 void
 pmodule_cmd_invite(void (*func) (const char *source, const char *chan, const char *nick))
 {
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index ea8d71aad..96d0e9167 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -765,9 +765,9 @@ void BahamutIRCdProto::cmd_topic(const char *whosets, const char *chan, const ch
 }
 
 /* UNSQLINE */
-void bahamut_cmd_unsqline(const char *user)
+void BahamutIRCdProto::cmd_unsqline(const char *user)
 {
-    send_cmd(NULL, "UNSQLINE %s", user);
+	send_cmd(NULL, "UNSQLINE %s", user);
 }
 
 /* JOIN - SJOIN */
@@ -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_unsqline(bahamut_cmd_unsqline);
     pmodule_cmd_invite(bahamut_cmd_invite);
     pmodule_cmd_part(bahamut_cmd_part);
     pmodule_cmd_391(bahamut_cmd_391);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index c0a39b79d..2f5e15312 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_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);
 void bahamut_cmd_391(const char *source, const char *timestr);
@@ -121,4 +120,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		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);
+		void cmd_unsqline(const char *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 722856133..1007d9b0a 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -816,13 +816,10 @@ void charybdis_cmd_vhost_on(const char *nick, const char *vIdent, const char *vh
              nick, vhost);
 }
 
-void charybdis_cmd_unsqline(const char *user)
+void CharybdisProto::cmd_unsqline(const char *user)
 {
-    Uid *ud;
-
-    ud = find_uid(s_OperServ);
-    send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ),
-             "UNRESV * %s", user);
+	Uid *ud = find_uid(s_OperServ);
+	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNRESV * %s", user);
 }
 
 void CharybdisProto::cmd_join(const char *user, const char *channel, time_t chantime)
@@ -1726,7 +1723,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(charybdis_cmd_375);
     pmodule_cmd_376(charybdis_cmd_376);
     pmodule_cmd_351(charybdis_cmd_351);
-    pmodule_cmd_unsqline(charybdis_cmd_unsqline);
     pmodule_cmd_invite(charybdis_cmd_invite);
     pmodule_cmd_part(charybdis_cmd_part);
     pmodule_cmd_391(charybdis_cmd_391);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 4588a81d8..5884967c7 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_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);
 void charybdis_cmd_391(const char *source, const char *timestr);
@@ -113,4 +112,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_quit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
 		void cmd_join(const char *, const char *, time_t);
+		void cmd_unsqline(const char *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index f5a483de9..d4b959bbc 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -819,12 +819,10 @@ void InspIRCdProto::cmd_join(const char *user, const char *channel, time_t chant
 }
 
 /* UNSQLINE */
-void inspircd_cmd_unsqline(const char *user)
+void InspIRCdProto::cmd_unsqline(const char *user)
 {
-    if (!user) {
-        return;
-    }
-    send_cmd(s_OperServ, "QLINE %s", user);
+	if (!user) return;
+	send_cmd(s_OperServ, "QLINE %s", user);
 }
 
 /* CHGIDENT */
@@ -1719,7 +1717,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(inspircd_cmd_375);
     pmodule_cmd_376(inspircd_cmd_376);
     pmodule_cmd_351(inspircd_cmd_351);
-    pmodule_cmd_unsqline(inspircd_cmd_unsqline);
     pmodule_cmd_invite(inspircd_cmd_invite);
     pmodule_cmd_part(inspircd_cmd_part);
     pmodule_cmd_391(inspircd_cmd_391);
@@ -1744,7 +1741,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_connect(inspircd_cmd_connect);
     pmodule_cmd_svshold(inspircd_cmd_svshold);
     pmodule_cmd_release_svshold(inspircd_cmd_release_svshold);
-    pmodule_cmd_unsgline(inspircd_cmd_unsqline);
+    pmodule_cmd_unsgline(inspircd_cmd_unsgline);
     pmodule_cmd_unszline(inspircd_cmd_unszline);
     pmodule_cmd_szline(inspircd_cmd_szline);
     pmodule_cmd_sgline(inspircd_cmd_sgline);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index a0f7b4c9b..6fca56a64 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_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);
 void inspircd_cmd_391(const char *source, const char *timestr);
@@ -125,4 +124,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		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);
+		void cmd_unsqline(const char *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 85bec0ccd..c872d4ca5 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -758,13 +758,10 @@ void ratbox_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost
     /* not supported  */
 }
 
-void ratbox_cmd_unsqline(const char *user)
+void RatboxProto::cmd_unsqline(const char *user)
 {
-    Uid *ud;
-
-    ud = find_uid(s_OperServ);
-    send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ),
-             "UNRESV * %s", user);
+	Uid *ud = find_uid(s_OperServ);
+	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNRESV * %s", user);
 }
 
 void RatboxProto::cmd_join(const char *user, const char *channel, time_t chantime)
@@ -1620,7 +1617,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(ratbox_cmd_375);
     pmodule_cmd_376(ratbox_cmd_376);
     pmodule_cmd_351(ratbox_cmd_351);
-    pmodule_cmd_unsqline(ratbox_cmd_unsqline);
     pmodule_cmd_invite(ratbox_cmd_invite);
     pmodule_cmd_part(ratbox_cmd_part);
     pmodule_cmd_391(ratbox_cmd_391);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 48f3ee4c4..0baa21ca6 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_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);
 void ratbox_cmd_391(const char *source, const char *timestr);
@@ -111,4 +110,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_quit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
 		void cmd_join(const char *, const char *, time_t);
+		void cmd_unsqline(const char *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index d68a7184d..cadf0873d 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -707,12 +707,10 @@ void UnrealIRCdProto::cmd_join(const char *user, const char *channel, time_t cha
 **	parv[0] = sender
 **	parv[1] = nickmask
 */
-void unreal_cmd_unsqline(const char *user)
+void UnrealIRCdProto::cmd_unsqline(const char *user)
 {
-    if (!user) {
-        return;
-    }
-    send_cmd(NULL, "%s %s", send_token("UNSQLINE", "d"), user);
+	if (!user) return;
+	send_cmd(NULL, "%s %s", send_token("UNSQLINE", "d"), user);
 }
 
 /* CHGHOST */
@@ -2018,7 +2016,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(unreal_cmd_375);
     pmodule_cmd_376(unreal_cmd_376);
     pmodule_cmd_351(unreal_cmd_351);
-    pmodule_cmd_unsqline(unreal_cmd_unsqline);
     pmodule_cmd_invite(unreal_cmd_invite);
     pmodule_cmd_part(unreal_cmd_part);
     pmodule_cmd_391(unreal_cmd_391);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 4621d95b5..07a0c3ba6 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_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);
 void unreal_cmd_391(const char *source, const char *timestr);
@@ -144,4 +143,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		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);
+		void cmd_unsqline(const char *);
 } ircd_proto;