Added cmd_vhost_off() function to IRCDProtoNew class.

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

11 files changed, 12 insertions, 42 deletions

diff --git a/src/ircd.c b/src/ircd.c
index f020f81b1..005b7b29b 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -46,7 +46,6 @@ void initIrcdProto()
 {
     ircdproto.ircd_set_mod_current_buffer = NULL;
     ircdproto.ircd_set_umode = NULL;
-    ircdproto.ircd_cmd_vhost_off = NULL;
     ircdproto.ircd_cmd_akill = NULL;
     ircdproto.ircd_cmd_svskill = NULL;
     ircdproto.ircd_cmd_svsmode = NULL;
@@ -147,9 +146,9 @@ void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit
 	ircdprotonew->cmd_topic(whosets, chan, whosetit, topic, when);
 }
 
-void anope_cmd_vhost_off(User * u)
+void anope_cmd_vhost_off(User *u)
 {
-    ircdproto.ircd_cmd_vhost_off(u);
+	ircdprotonew->cmd_vhost_off(u);
 }
 
 void anope_cmd_akill(const char *user, const char *host, const char *who, time_t when,
@@ -688,11 +687,6 @@ void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av))
     ircdproto.ircd_set_mod_current_buffer = func;
 }
 
-void pmodule_cmd_vhost_off(void (*func) (User * u))
-{
-    ircdproto.ircd_cmd_vhost_off = func;
-}
-
 void pmodule_cmd_akill(void (*func)
                         (const char *user, const char *host, const char *who, time_t when,
                          time_t expires, const char *reason))
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 59d48647a..c023340d5 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1340,11 +1340,6 @@ void bahamut_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhos
     /* Not Supported by this IRCD */
 }
 
-void bahamut_cmd_vhost_off(User * u)
-{
-    /* Not Supported by this IRCD */
-}
-
 /* SVSMODE +d */
 /* sent if svid is something weird */
 void bahamut_cmd_svid_umode(const char *nick, time_t ts)
@@ -1552,7 +1547,6 @@ void bahamut_cmd_chghost(const char *nick, const char *vhost)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_vhost_off(bahamut_cmd_vhost_off);
     pmodule_cmd_akill(bahamut_cmd_akill);
     pmodule_cmd_svskill(bahamut_cmd_svskill);
     pmodule_cmd_svsmode(bahamut_cmd_svsmode);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index bb41b9bc5..4a882ff88 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -59,7 +59,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void bahamut_set_umode(User * user, int ac, const char **av);
-void bahamut_cmd_vhost_off(User * u);
 void bahamut_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void bahamut_cmd_svskill(const char *source, const char *user, const char *buf);
 void bahamut_cmd_svsmode(User * u, int ac, const char **av);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 9442122b3..d2e895cfb 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -841,8 +841,7 @@ void CharybdisProto::cmd_topic(const char *whosets, const char *chan, const char
 
 void charybdis_cmd_vhost_off(User * u)
 {
-    send_cmd((UseTS6 ? TS6SID : ServerName), "ENCAP * CHGHOST %s :%s",
-             u->nick, u->host);
+	send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", u->nick, u->host);
 }
 
 void charybdis_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
@@ -1828,7 +1827,6 @@ int charybdis_send_deaccount(int argc, char **argv)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_vhost_off(charybdis_cmd_vhost_off);
     pmodule_cmd_akill(charybdis_cmd_akill);
     pmodule_cmd_svskill(charybdis_cmd_svskill);
     pmodule_cmd_svsmode(charybdis_cmd_svsmode);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 1489085ca..c93be8dfc 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -47,7 +47,6 @@
 
 
 void charybdis_set_umode(User * user, int ac, const char **av);
-void charybdis_cmd_vhost_off(User * u);
 void charybdis_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void charybdis_cmd_svskill(const char *source, const char *user, const char *buf);
 void charybdis_cmd_svsmode(User * u, int ac, const char **av);
@@ -116,4 +115,5 @@ class CharybdisProto : public IRCDProtoNew {
 	public:
 		void cmd_remove_akill(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
+		void cmd_vhost_off(User *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index ad646a520..57b8d1a17 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -538,9 +538,9 @@ void InspIRCdProto::cmd_topic(const char *whosets, const char *chan, const char
 	send_cmd(whosets, "FTOPIC %s %lu %s :%s", chan, static_cast<unsigned long>(when), whosetit, topic);
 }
 
-void inspircd_cmd_vhost_off(User * u)
+void InspIRCdProto::cmd_vhost_off(User *u)
 {
-    send_cmd(s_HostServ, "MODE %s -x", u->nick);
+	send_cmd(s_HostServ, "MODE %s -x", u->nick);
 }
 
 void
@@ -1786,7 +1786,6 @@ void inspircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_vhost_off(inspircd_cmd_vhost_off);
     pmodule_cmd_akill(inspircd_cmd_akill);
     pmodule_cmd_svskill(inspircd_cmd_svskill);
     pmodule_cmd_svsmode(inspircd_cmd_svsmode);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 981bb9e79..9f42079f9 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -52,7 +52,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void inspircd_set_umode(User * user, int ac, const char **av);
-void inspircd_cmd_vhost_off(User * u);
 void inspircd_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void inspircd_cmd_svskill(const char *source, const char *user, const char *buf);
 void inspircd_cmd_svsmode(User * u, int ac, const char **av);
@@ -132,4 +131,5 @@ class InspIRCdProto : public IRCDProtoNew {
 	public:
 		void cmd_remove_akill(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
+		void cmd_vhost_off(User *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 9bb5df39c..98e13d0f4 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -787,11 +787,6 @@ void RatboxProto::cmd_topic(const char *whosets, const char *chan, const char *w
 	send_cmd(UseTS6 ? (ud ? ud->uid : whosets) : whosets, "TOPIC %s :%s", chan, topic);
 }
 
-void ratbox_cmd_vhost_off(User * u)
-{
-    /* not supported  */
-}
-
 void ratbox_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
 {
     /* not supported  */
@@ -1724,7 +1719,6 @@ void ratbox_cmd_ctcp(const char *source, const char *dest, const char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_vhost_off(ratbox_cmd_vhost_off);
     pmodule_cmd_akill(ratbox_cmd_akill);
     pmodule_cmd_svskill(ratbox_cmd_svskill);
     pmodule_cmd_svsmode(ratbox_cmd_svsmode);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 9a3e647c0..324195f88 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -46,7 +46,6 @@
 
 
 void ratbox_set_umode(User * user, int ac, const char **av);
-void ratbox_cmd_vhost_off(User * u);
 void ratbox_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void ratbox_cmd_svskill(const char *source, const char *user, const char *buf);
 void ratbox_cmd_svsmode(User * u, int ac, const char **av);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index fb1ffab4c..fc2d1e4e6 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -522,17 +522,11 @@ void UnrealIRCdProto::cmd_topic(const char *whosets, const char *chan, const cha
 	send_cmd(whosets, "%s %s %s %lu :%s", send_token("TOPIC", ")"), chan, whosetit, static_cast<unsigned long>(when), topic);
 }
 
-void unreal_cmd_vhost_off(User * u)
+void UnrealIRCdProto::cmd_vhost_off(User *u)
 {
-    if (UseSVS2MODE) {
-        send_cmd(s_HostServ, "%s %s -xt", send_token("SVS2MODE", "v"),
-                 u->nick);
-    } else {
-        send_cmd(s_HostServ, "%s %s -xt", send_token("SVSMODE", "n"),
-                 u->nick);
-    }
-    notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick,
-                myIrcd->vhostchar);
+	if (UseSVS2MODE) send_cmd(s_HostServ, "%s %s -xt", send_token("SVS2MODE", "v"), u->nick);
+	else send_cmd(s_HostServ, "%s %s -xt", send_token("SVSMODE", "n"), u->nick);
+	notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, myIrcd->vhostchar);
 }
 
 void unreal_cmd_akill(const char *user, const char *host, const char *who, time_t when,
@@ -2104,7 +2098,6 @@ void moduleAddIRCDMsgs(void) {
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_vhost_off(unreal_cmd_vhost_off);
     pmodule_cmd_akill(unreal_cmd_akill);
     pmodule_cmd_svskill(unreal_cmd_svskill);
     pmodule_cmd_svsmode(unreal_cmd_svsmode);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index a8be0e1c5..c5557ba80 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -81,7 +81,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void unreal_set_umode(User * user, int ac, const char **av);
-void unreal_cmd_vhost_off(User * u);
 void unreal_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void unreal_cmd_svskill(const char *source, const char *user, const char *buf);
 void unreal_cmd_svsmode(User * u, int ac, const char **av);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_svsnoop(const char *, int);
 		void cmd_remove_akill(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
+		void cmd_vhost_off(User *);
 } ircd_proto;