Remove VF_COMMON from mode-provider modules (no longer needed due to better CAPAB...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / compat.cpp

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 3724319b700c86ca73fcc5edf3793a57fea2b40e..fe262134fe40d1ea86f18e1b477719a260d174d2 100644 (file)
--- 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,18 +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)
 {
@@ -40,6 +81,12 @@ void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
                        if (ServerInstance->Modules->Find(forge_common_1201[i]))
                                modlist.push_back(forge_common_1201[i]);
                }
+               // module was merged
+               if (ServerInstance->Modules->Find("m_operchans.so"))
+               {
+                       modlist.push_back("m_operchans.so");
+                       modlist.push_back("m_operinvex.so");
+               }
        }
 }
 
@@ -69,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")
                        {
@@ -109,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);
 }