Clean up some of the old now unused IRCDVar struct vars, and made the logchan bots join if the IRCd requires them to

6 files changed, 3 insertions, 46 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 5c9a35032..ae65bd364 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -16,15 +16,13 @@
 
 IRCDVar myIrcd[] = {
 	{"Bahamut 1.8.x",	/* ircd name */
-	 "+",				/* Modes used by pseudoclients */
+	"+",					/* Modes used by pseudoclients */
 	 2,					/* Chan Max Symbols */
-	 "+o",				/* Channel Umode used by Botserv bots */
 	 1,					/* SVSNICK */
 	 0,					/* Vhost */
 	 1,					/* Supports SNlines */
 	 1,					/* Supports SQlines */
 	 1,					/* Supports SZlines */
-	 3,					/* Number of server args */
 	 0,					/* Join 2 Set */
 	 0,					/* Join 2 Message */
 	 0,					/* TS Topic Forward */
@@ -40,13 +38,10 @@ IRCDVar myIrcd[] = {
 	 0,					/* O:LINE */
 	 1,					/* UMODE */
 	 0,					/* VHOST ON NICK */
-	 0,					/* Change RealName */
 	 1,					/* No Knock requires +i */
-	 0,					/* We support TOKENS */
 	 0,					/* Can remove User Channel Modes with SVSMODE */
 	 0,					/* Sglines are not enforced until user reconnects */
 	 0,					/* ts6 */
-	 0,					/* p10 */
 	 0,					/* CIDR channelbans */
 	 "$",				/* TLD Prefix for Global */
 	 6,					/* Max number of modes we can send per line */
@@ -772,9 +767,7 @@ class ProtoBahamut : public Module
 		this->SetAuthor("Anope");
 		this->SetType(PROTOCOL);
 
-		pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
 		pmodule_ircd_var(myIrcd);
-		pmodule_ircd_useTSMode(0);
 
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_TSMODE, CAPAB_UNCONNECT, CAPAB_BURST, CAPAB_DKEY, CAPAB_DOZIP };
 		for (unsigned i = 0; i < 6; ++i)
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 20b347899..ebbedd362 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -19,13 +19,11 @@ IRCDVar myIrcd[] = {
 	{"InspIRCd 1.1",	/* ircd name */
 	 "+I",				/* Modes used by pseudoclients */
 	 5,					/* Chan Max Symbols */
-	 "+ao",				/* Channel Umode used by Botserv bots */
 	 1,					/* SVSNICK */
 	 1,					/* Vhost */
 	 1,					/* Supports SNlines */
 	 1,					/* Supports SQlines */
 	 1,					/* Supports SZlines */
-	 4,					/* Number of server args */
 	 0,					/* Join 2 Set */
 	 1,					/* Join 2 Message */
 	 1,					/* TS Topic Forward */
@@ -41,13 +39,10 @@ IRCDVar myIrcd[] = {
 	 1,					/* O:LINE */
 	 1,					/* UMODE */
 	 1,					/* VHOST ON NICK */
-	 0,					/* Change RealName */
 	 1,					/* No Knock requires +i */
-	 0,					/* We support inspircd TOKENS */
 	 0,					/* Can remove User Channel Modes with SVSMODE */
 	 0,					/* Sglines are not enforced until user reconnects */
 	 0,					/* ts6 */
-	 0,					/* p10 */
 	 1,					/* CIDR channelbans */
 	 "$",				/* TLD Prefix for Global */
 	 20,				/* Max number of modes we can send per line */
@@ -1092,9 +1087,7 @@ class ProtoInspIRCd : public Module
 		this->SetAuthor("Anope");
 		this->SetType(PROTOCOL);
 
-		pmodule_ircd_version("InspIRCd 1.1");
 		pmodule_ircd_var(myIrcd);
-		pmodule_ircd_useTSMode(0);
 
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_SSJ3, CAPAB_NICK2, CAPAB_VL, CAPAB_TLKEXT };
 		for (unsigned i = 0; i < 5; ++i)
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 30d4f3600..3c5d0f11c 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -19,13 +19,11 @@ IRCDVar myIrcd[] = {
 	{"InspIRCd 1.2",	/* ircd name */
 	 "+I",				/* Modes used by pseudoclients */
 	 5,					/* Chan Max Symbols */
-	 "+ao",				/* Channel Umode used by Botserv bots */
 	 1,					/* SVSNICK */
 	 1,					/* Vhost */
 	 0,					/* Supports SNlines */
 	 1,					/* Supports SQlines */
 	 1,					/* Supports SZlines */
-	 4,					/* Number of server args */
 	 0,					/* Join 2 Set */
 	 0,					/* Join 2 Message */
 	 1,					/* TS Topic Forward */
@@ -41,13 +39,10 @@ IRCDVar myIrcd[] = {
 	 0,					/* O:LINE */
 	 1,					/* UMODE */
 	 1,					/* VHOST ON NICK */
-	 0,					/* Change RealName */
 	 1,					/* No Knock requires +i */
-	 0,					/* We support inspircd TOKENS */
 	 0,					/* Can remove User Channel Modes with SVSMODE */
 	 0,					/* Sglines are not enforced until user reconnects */
 	 1,					/* ts6 */
-	 0,					/* p10 */
 	 1,					/* CIDR channelbans */
 	 "$",				/* TLD Prefix for Global */
 	 20,				/* Max number of modes we can send per line */
@@ -1270,9 +1265,7 @@ class ProtoInspIRCd : public Module
 		if (!Config->Numeric.empty())
 			TS6SID = Config->Numeric;
 
-		pmodule_ircd_version("InspIRCd 1.2");
 		pmodule_ircd_var(myIrcd);
-		pmodule_ircd_useTSMode(0);
 
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_SSJ3, CAPAB_NICK2, CAPAB_VL, CAPAB_TLKEXT };
 		for (unsigned i = 0; i < 5; ++i)
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 1b6a582c0..1770445cc 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -19,13 +19,11 @@ IRCDVar myIrcd[] = {
 	{"InspIRCd 2.0",	/* ircd name */
 	 "+I",				/* Modes used by pseudoclients */
 	 5,					/* Chan Max Symbols */
-	 "+ao",				/* Channel Umode used by Botserv bots */
 	 1,					/* SVSNICK */
 	 1,					/* Vhost */
 	 0,					/* Supports SNlines */
 	 1,					/* Supports SQlines */
 	 1,					/* Supports SZlines */
-	 4,					/* Number of server args */
 	 0,					/* Join 2 Set */
 	 0,					/* Join 2 Message */
 	 1,					/* TS Topic Forward */
@@ -41,13 +39,10 @@ IRCDVar myIrcd[] = {
 	 0,					/* O:LINE */
 	 1,					/* UMODE */
 	 1,					/* VHOST ON NICK */
-	 0,					/* Change RealName */
 	 1,					/* No Knock requires +i */
-	 0,					/* We support inspircd TOKENS */
 	 0,					/* Can remove User Channel Modes with SVSMODE */
 	 0,					/* Sglines are not enforced until user reconnects */
 	 1,					/* ts6 */
-	 0,					/* p10 */
 	 1,					/* CIDR channelbans */
 	 "$",				/* TLD Prefix for Global */
 	 20,				/* Max number of modes we can send per line */
@@ -1244,9 +1239,7 @@ class ProtoInspIRCd : public Module
 		if (!Config->Numeric.empty())
 			TS6SID = Config->Numeric;
 
-		pmodule_ircd_version("InspIRCd 2.0");
 		pmodule_ircd_var(myIrcd);
-		pmodule_ircd_useTSMode(0);
 
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_SSJ3, CAPAB_NICK2, CAPAB_VL, CAPAB_TLKEXT };
 		for (unsigned i = 0; i < 5; ++i)
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index b45f1121a..db5c4d5bd 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -18,13 +18,11 @@ IRCDVar myIrcd[] = {
 	{"Ratbox 2.0+",	/* ircd name */
 	 "+oi",			/* Modes used by pseudoclients */
 	 2,				/* Chan Max Symbols */
-	 "+o",			/* Channel Umode used by Botserv bots */
 	 0,				/* SVSNICK */
 	 0,				/* Vhost */
 	 1,				/* Supports SNlines */
 	 1,				/* Supports SQlines */
 	 0,				/* Supports SZlines */
-	 3,				/* Number of server args */
 	 1,				/* Join 2 Set */
 	 1,				/* Join 2 Message */
 	 0,				/* TS Topic Forward */
@@ -40,13 +38,10 @@ IRCDVar myIrcd[] = {
 	 0,				/* UMODE */
 	 0,				/* O:LINE */
 	 0,				/* VHOST ON NICK */
-	 0,				/* Change RealName */
 	 0,				/* No Knock requires +i */
-	 0,				/* We support TOKENS */
 	 0,				/* Can remove User Channel Modes with SVSMODE */
 	 0,				/* Sglines are not enforced until user reconnects */
 	 1,				/* ts6 */
-	 0,				/* p10 */
 	 0,				/* CIDR channelbans */
 	 "$$",			/* TLD Prefix for Global */
 	 4,				/* Max number of modes we can send per line */
@@ -793,14 +788,11 @@ class ProtoRatbox : public Module
 
 		if (!Config->Numeric.empty())
 			TS6SID = Config->Numeric;
-		UseTSMODE = 1;  /* TMODE */
 
-		pmodule_ircd_version("Ratbox IRCD 2.0+");
 		pmodule_ircd_var(myIrcd);
-		pmodule_ircd_useTSMode(1);
 
-		CapabType c[] = { CAPAB_ZIP, CAPAB_TS5, CAPAB_QS, CAPAB_UID, CAPAB_KNOCK };
-		for (unsigned i = 0; i < 5; ++i)
+		CapabType c[] = { CAPAB_ZIP, CAPAB_TS5, CAPAB_QS, CAPAB_UID, CAPAB_KNOCK, CAPAB_TSMODE };
+		for (unsigned i = 0; i < 6; ++i)
 			Capab.SetFlag(c[i]);
 
 		AddModes();
diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp
index 5304e9d83..047f51b15 100644
--- a/modules/protocol/unreal32.cpp
+++ b/modules/protocol/unreal32.cpp
@@ -18,13 +18,11 @@ IRCDVar myIrcd[] = {
 	{"UnrealIRCd 3.2.x",	/* ircd name */
 	 "+Soi",				/* Modes used by pseudoclients */
 	 5,						/* Chan Max Symbols */
-	 "+ao",					/* Channel Umode used by Botserv bots */
 	 1,						/* SVSNICK */
 	 1,						/* Vhost */
 	 1,						/* Supports SNlines */
 	 1,						/* Supports SQlines */
 	 1,						/* Supports SZlines */
-	 3,						/* Number of server args */
 	 0,						/* Join 2 Set */
 	 0,						/* Join 2 Message */
 	 1,						/* TS Topic Forward */
@@ -40,13 +38,10 @@ IRCDVar myIrcd[] = {
 	 1,						/* O:LINE */
 	 1,						/* UMODE */
 	 1,						/* VHOST ON NICK */
-	 1,						/* Change RealName */
 	 1,						/* No Knock requires +i */
-	 1,						/* We support Unreal TOKENS */
 	 1,						/* Can remove User Channel Modes with SVSMODE */
 	 0,						/* Sglines are not enforced until user reconnects */
 	 0,						/* ts6 */
-	 0,						/* p10 */
 	 0,						/* CIDR channelbans */
 	 "$",					/* TLD Prefix for Global */
 	 12,					/* Max number of modes we can send per line */
@@ -1265,9 +1260,7 @@ class ProtoUnreal : public Module
 		this->SetAuthor("Anope");
 		this->SetType(PROTOCOL);
 
-		pmodule_ircd_version("UnrealIRCd 3.2+");
 		pmodule_ircd_var(myIrcd);
-		pmodule_ircd_useTSMode(0);
 
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_NICKIP, CAPAB_ZIP, CAPAB_TOKEN, CAPAB_SSJ3, CAPAB_NICK2, CAPAB_VL, CAPAB_TLKEXT, CAPAB_CHANMODE, CAPAB_NICKCHARS };
 		for (unsigned i = 0; i < 10; ++i)