X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=fe262134fe40d1ea86f18e1b477719a260d174d2;hb=f8ccaed31d68661d16eae1a412b337af09de111b;hp=6d804aa716b1aeb6a476ff3286adc8d0111d9a0c;hpb=6d715e128f9cea6c25cc57dc23c1bccdbbfda475;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 6d804aa71..fe262134f 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,19 +16,59 @@
 #include "treesocket.h"
 
 static const char* const forge_common_1201[] = {
+	"m_allowinvite.so",
+	"m_auditorium.so",
+	"m_banexception.so",
+	"m_blockcaps.so",
+	"m_blockcolor.so",
+	"m_botmode.so",
+	"m_censor.so",
+	"m_chanfilter.so",
+	"m_chanhistory.so",
+	"m_chanprotect.so",
 	"m_chghost.so",
 	"m_chgname.so",
+	"m_commonchans.so",
+	"m_deaf.so",
+	"m_delayjoin.so",
+	"m_delaymsg.so",
+	"m_exemptchanops.so",
+	"m_helpop.so",
+	"m_hidechans.so",
+	"m_hideoper.so",
+	"m_invisible.so",
+	"m_inviteexception.so",
+	"m_joinflood.so",
+	"m_kicknorejoin.so",
+	"m_messageflood.so",
+	"m_nickflood.so",
+	"m_noctcp.so",
+	"m_nokicks.so",
+	"m_nonicks.so",
+	"m_nonotice.so",
+	"m_ojoin.so",
+	"m_operprefix.so",
+	"m_permchannels.so",
+	"m_redirect.so",
+	"m_regex_glob.so",
+	"m_regex_pcre.so",
+	"m_regex_posix.so",
+	"m_regex_tre.so",
 	"m_remove.so",
 	"m_sajoin.so",
 	"m_sakick.so",
 	"m_sanick.so",
 	"m_sapart.so",
 	"m_saquit.so",
+	"m_servprotect.so",
 	"m_setident.so",
+	"m_sslmodes.so",
+	"m_stripcolor.so",
 	"m_swhois.so",
 };
 
 static std::string wide_newline("\r\n");
+static std::string newline("\n");
 
 void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
 {
@@ -43,7 +83,10 @@ void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
 		}
 		// module was merged
 		if (ServerInstance->Modules->Find("m_operchans.so"))
+		{
+			modlist.push_back("m_operchans.so");
 			modlist.push_back("m_operinvex.so");
+		}
 	}
 }
 
@@ -73,7 +116,7 @@ void TreeSocket::WriteLine(std::string line)
 				ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Rewriting SAVE for 1201-protocol server");
 				std::string::size_type c = line.find(' ', b + 1);
 				std::string uid = line.substr(b, c - b);
-				line = ":" + ServerInstance->Config->GetSID() + " SVSNICK " + uid + line.substr(b);
+				line = ":" + ServerInstance->Config->GetSID() + " SVSNICK" + uid + line.substr(b);
 			}
 			else if (proto_version < 1202 && command == "AWAY")
 			{
@@ -113,5 +156,8 @@ void TreeSocket::WriteLine(std::string line)
 
 	ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
 	this->WriteData(line);
-	this->WriteData(wide_newline);
+	if (proto_version < 1202)
+		this->WriteData(wide_newline);
+	else
+		this->WriteData(newline);
 }