Added cmd_szline() function to IRCDProtoNew class.

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

11 files changed, 11 insertions, 39 deletions

diff --git a/src/ircd.c b/src/ircd.c
index 370507d5b..2bd2e69e0 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_szline = NULL;
     ircdproto.ircd_cmd_sgline = NULL;
     ircdproto.ircd_cmd_unban = NULL;
     ircdproto.ircd_cmd_svsmode_chan = NULL;
@@ -513,7 +512,7 @@ void anope_cmd_unszline(const char *mask)
 
 void anope_cmd_szline(const char *mask, const char *reason, const char *whom)
 {
-    ircdproto.ircd_cmd_szline(mask, reason, whom);
+	ircdprotonew->cmd_szline(mask, reason, whom);
 }
 
 void anope_cmd_sgline(const char *mask, const char *reason)
@@ -701,12 +700,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void
-pmodule_cmd_szline(void (*func) (const char *mask, const char *reason, const char *whom))
-{
-    ircdproto.ircd_cmd_szline = func;
-}
-
 void pmodule_cmd_sgline(void (*func) (const char *mask, const char *reason))
 {
     ircdproto.ircd_cmd_sgline = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index b0cf99c14..dd3aea8a2 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -710,11 +710,10 @@ void BahamutIRCdProto::cmd_unszline(const char *mask)
 /* SZLINE */
 void bahamut_cmd_szline(const char *mask, const char *reason, const char *whom)
 {
-    /* this will likely fail so its only here for legacy */
-    send_cmd(NULL, "SZLINE %s :%s", mask, reason);
-    /* this is how we are supposed to deal with it */
-    send_cmd(NULL, "AKILL %s * %d %s %ld :%s", mask, 86400 * 2, whom,
-             (long int) time(NULL), reason);
+	/* this will likely fail so its only here for legacy */
+	send_cmd(NULL, "SZLINE %s :%s", mask, reason);
+	/* this is how we are supposed to deal with it */
+	send_cmd(NULL, "AKILL %s * %d %s %ld :%s", mask, 172800, whom, static_cast<long>(time(NULL)), reason);
 }
 
 /* SVSNOOP */
@@ -1396,7 +1395,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_szline(bahamut_cmd_szline);
     pmodule_cmd_sgline(bahamut_cmd_sgline);
     pmodule_cmd_unban(bahamut_cmd_unban);
     pmodule_cmd_svsmode_chan(bahamut_cmd_svsmode_chan);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 752c1b8f6..5c213511b 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who);
 void bahamut_cmd_242(const char *buf);
 void bahamut_cmd_243(const char *buf);
 void bahamut_cmd_211(const char *buf);
-void bahamut_cmd_szline(const char *mask, const char *reason, const char *whom);
 void bahamut_cmd_sgline(const char *mask, const char *reason);
 void bahamut_cmd_unban(const char *name, const char *nick);
 void bahamut_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
@@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_release_svshold(const char *);
 		void cmd_unsgline(const char *);
 		void cmd_unszline(const char *);
+		void cmd_szline(const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 06c46590f..58c8bd536 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -758,11 +758,6 @@ void CharybdisProto::cmd_unsgline(const char *mask)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
 }
 
-void charybdis_cmd_szline(const char *mask, const char *reason, const char *whom)
-{
-    /* not supported */
-}
-
 void charybdis_cmd_svsadmin(const char *server, int set)
 {
 }
@@ -1662,7 +1657,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_szline(charybdis_cmd_szline);
     pmodule_cmd_sgline(charybdis_cmd_sgline);
     pmodule_cmd_unban(charybdis_cmd_unban);
     pmodule_cmd_svsmode_chan(charybdis_cmd_svsmode_chan);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 6185d3443..bd99f1b33 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who);
 void charybdis_cmd_242(const char *buf);
 void charybdis_cmd_243(const char *buf);
 void charybdis_cmd_211(const char *buf);
-void charybdis_cmd_szline(const char *mask, const char *reason, const char *whom);
 void charybdis_cmd_sgline(const char *mask, const char *reason);
 void charybdis_cmd_unban(const char *name, const char *nick);
 void charybdis_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 94144afd4..6f49b4788 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1476,8 +1476,7 @@ void InspIRCdProto::cmd_unszline(const char *mask)
 /* SZLINE */
 void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom)
 {
-    send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom,
-             (long int) time(NULL), reason);
+	send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason);
 }
 
 /* SGLINE */
@@ -1641,7 +1640,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_szline(inspircd_cmd_szline);
     pmodule_cmd_sgline(inspircd_cmd_sgline);
     pmodule_cmd_unban(inspircd_cmd_unban);
     pmodule_cmd_svsmode_chan(inspircd_cmd_svsmode_chan);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 1f6f34a0f..54f6a47ca 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who);
 void inspircd_cmd_242(const char *buf);
 void inspircd_cmd_243(const char *buf);
 void inspircd_cmd_211(const char *buf);
-void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom);
 void inspircd_cmd_sgline(const char *mask, const char *reason);
 void inspircd_cmd_unban(const char *name, const char *nick);
 void inspircd_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
@@ -118,4 +117,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_svshold(const char *);
 		void cmd_release_svshold(const char *);
 		void cmd_unszline(const char *);
+		void cmd_szline(const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 184844a61..406d25d0b 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -705,11 +705,6 @@ void RatboxProto::cmd_unsgline(const char *mask)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
 }
 
-void ratbox_cmd_szline(const char *mask, const char *reason, const char *whom)
-{
-    /* Does not support */
-}
-
 void ratbox_cmd_svsadmin(const char *server, int set)
 {
 }
@@ -1540,7 +1535,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_szline(ratbox_cmd_szline);
     pmodule_cmd_sgline(ratbox_cmd_sgline);
     pmodule_cmd_unban(ratbox_cmd_unban);
     pmodule_cmd_svsmode_chan(ratbox_cmd_svsmode_chan);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 7fa42360e..304812fac 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who);
 void ratbox_cmd_242(const char *buf);
 void ratbox_cmd_243(const char *buf);
 void ratbox_cmd_211(const char *buf);
-void ratbox_cmd_szline(const char *mask, const char *reason, const char *whom);
 void ratbox_cmd_sgline(const char *mask, const char *reason);
 void ratbox_cmd_unban(const char *name, const char *nick);
 void ratbox_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 2e833f288..c5e85f180 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1366,11 +1366,9 @@ void UnrealIRCdProto::cmd_unszline(const char *mask)
 }
 
 /* SZLINE */
-void unreal_cmd_szline(const char *mask, const char *reason, const char *whom)
+void UnrealIRCdProto::cmd_szline(const char *mask, const char *reason, const char *whom)
 {
-    send_cmd(NULL, "%s + Z * %s %s %ld %ld :%s", send_token("TKL", "BD"),
-             mask, whom, (long int) time(NULL) + 86400 * 2,
-             (long int) time(NULL), reason);
+	send_cmd(NULL, "%s + Z * %s %s %ld %ld :%s", send_token("TKL", "BD"), mask, whom, static_cast<long>(time(NULL) + 172800), static_cast<long>(time(NULL)), reason);
 }
 
 /* SGLINE */
@@ -1937,7 +1935,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_szline(unreal_cmd_szline);
     pmodule_cmd_sgline(unreal_cmd_sgline);
     pmodule_cmd_unban(unreal_cmd_unban);
     pmodule_cmd_svsmode_chan(unreal_cmd_svsmode_chan);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index e19c29611..f1352278d 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who);
 void unreal_cmd_242(const char *buf);
 void unreal_cmd_243(const char *buf);
 void unreal_cmd_211(const char *buf);
-void unreal_cmd_szline(const char *mask, const char *reason, const char *whom);
 void unreal_cmd_sgline(const char *mask, const char *reason);
 void unreal_cmd_unban(const char *name, const char *nick);
 void unreal_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_release_svshold(const char *);
 		void cmd_unsgline(const char *);
 		void cmd_unszline(const char *);
+		void cmd_szline(const char *, const char *, const char *);
 } ircd_proto;