diff options
38 files changed, 79 insertions, 49 deletions
diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp index 445217f53..1af35bdd4 100644 --- a/src/modules/m_allowinvite.cpp +++ b/src/modules/m_allowinvite.cpp @@ -66,7 +66,7 @@ class ModuleAllowInvite : public Module virtual Version GetVersion() { - return Version("Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it)",VF_COMMON|VF_VENDOR); + return Version("Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it)",VF_VENDOR); } }; diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 38a920cf5..4dec57df9 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -70,7 +70,7 @@ class ModuleAuditorium : public Module Version GetVersion() { - return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR); + return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR); } void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index dd2b51411..ddf2fcb87 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -122,7 +122,7 @@ public: Version GetVersion() { - return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR); + return Version("Provides support for the +e channel mode", VF_VENDOR); } }; diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 3fc603a85..ade42cb4b 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -128,7 +128,7 @@ public: virtual Version GetVersion() { - return Version("Provides support to block all-CAPS channel messages and notices", VF_COMMON|VF_VENDOR); + return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); } }; diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 941ebe403..9ffb36b80 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -86,7 +86,7 @@ class ModuleBlockColour : public Module virtual Version GetVersion() { - return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR); + return Version("Provides support for unreal-style channel mode +c",VF_VENDOR); } }; diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 8e4cc130c..4664dad75 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -43,7 +43,7 @@ class ModuleBotMode : public Module virtual Version GetVersion() { - return Version("Provides support for unreal-style umode +B",VF_COMMON|VF_VENDOR); + return Version("Provides support for unreal-style umode +B",VF_VENDOR); } virtual void OnWhois(User* src, User* dst) diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index bb316c8fa..03d591fa8 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -127,7 +127,7 @@ class ModuleCensor : public Module virtual Version GetVersion() { - return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR); + return Version("Provides user and channel +G mode",VF_VENDOR); } }; diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index fc511d8e6..e790a15d8 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -135,7 +135,7 @@ class ModuleChanFilter : public Module virtual Version GetVersion() { - return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR); + return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR); } virtual ~ModuleChanFilter() diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index cd560ba88..bdc257511 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -114,7 +114,7 @@ class ModuleChanHistory : public Module Version GetVersion() { - return Version("Provides channel history replayed on join", VF_COMMON | VF_VENDOR); + return Version("Provides channel history replayed on join", VF_VENDOR); } }; diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 77fe3f353..61ffa3ad2 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -287,7 +287,7 @@ class ModuleChanProtect : public Module Version GetVersion() { - return Version("Founder and Protect modes (+qa)", VF_COMMON | VF_VENDOR); + return Version("Founder and Protect modes (+qa)", VF_VENDOR); } }; diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp index e6f2b54a2..18f1df29f 100644 --- a/src/modules/m_commonchans.cpp +++ b/src/modules/m_commonchans.cpp @@ -64,7 +64,7 @@ class ModulePrivacyMode : public Module virtual Version GetVersion() { - return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_COMMON|VF_VENDOR); + return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_VENDOR); } virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index 3d8f29cf1..6b9050285 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -155,7 +155,7 @@ class ModuleDeaf : public Module virtual Version GetVersion() { - return Version("Provides support for ircu style usermode +d (deaf to channel messages and channel notices)", VF_COMMON|VF_VENDOR); + return Version("Provides support for ircu style usermode +d (deaf to channel messages and channel notices)", VF_VENDOR); } }; diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 635359823..dd0dadd69 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -78,7 +78,7 @@ ModuleDelayJoin::~ModuleDelayJoin() Version ModuleDelayJoin::GetVersion() { - return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_COMMON | VF_VENDOR); + return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_VENDOR); } void ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index 9c80c3568..89d62a6a0 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -87,7 +87,7 @@ ModuleDelayMsg::~ModuleDelayMsg() Version ModuleDelayMsg::GetVersion() { - return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR); + return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_VENDOR); } void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&) diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index 27b4e704f..0b5acdd10 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -77,7 +77,7 @@ class ModuleExemptChanOps : public Module virtual Version GetVersion() { - return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR|VF_COMMON); + return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); } virtual void OnRehash(User* user) diff --git a/src/modules/m_halfop.cpp b/src/modules/m_halfop.cpp index e251802e0..d0ad44891 100644 --- a/src/modules/m_halfop.cpp +++ b/src/modules/m_halfop.cpp @@ -84,7 +84,7 @@ class ModuleHalfop : public Module Version GetVersion() { - return Version("Channel half-operator mode provider", VF_VENDOR|VF_COMMON); + return Version("Channel half-operator mode provider", VF_VENDOR); } }; diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 6533aa595..cbb56c3f9 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -182,7 +182,7 @@ class ModuleHelpop : public Module virtual Version GetVersion() { - return Version("/helpop Command, Works like Unreal helpop", VF_VENDOR | VF_COMMON); + return Version("/helpop Command, Works like Unreal helpop", VF_VENDOR); } }; diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp index b8c3be471..3f02d5437 100644 --- a/src/modules/m_hidechans.cpp +++ b/src/modules/m_hidechans.cpp @@ -65,7 +65,7 @@ class ModuleHideChans : public Module virtual Version GetVersion() { - return Version("Provides support for hiding channels with user mode +I", VF_COMMON | VF_VENDOR); + return Version("Provides support for hiding channels with user mode +I", VF_VENDOR); } virtual void OnRehash(User* user) diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp index 856c43905..18db0320c 100644 --- a/src/modules/m_hideoper.cpp +++ b/src/modules/m_hideoper.cpp @@ -68,7 +68,7 @@ class ModuleHideOper : public Module virtual Version GetVersion() { - return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR); + return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR); } ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 999393d5f..abedaf0ce 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -139,7 +139,7 @@ class ModuleInvisible : public Module Version ModuleInvisible::GetVersion() { - return Version("Allows opers to join channels invisibly", VF_COMMON | VF_VENDOR); + return Version("Allows opers to join channels invisibly", VF_VENDOR); } static void BuildExcept(Membership* memb, CUList& excepts) diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index b81a5237d..d90231081 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -91,7 +91,7 @@ public: Version GetVersion() { - return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON); + return Version("Provides support for the +I channel mode", VF_VENDOR); } }; diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index d0c3d8a50..8922b4eae 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -237,7 +237,7 @@ class ModuleJoinFlood : public Module Version GetVersion() { - return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR); + return Version("Provides channel mode +j (join flood protection)", VF_VENDOR); } }; diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 037dc5678..76cf3b976 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -116,7 +116,7 @@ public: Version GetVersion() { - return Version("Channel mode to delay rejoin after kick", VF_COMMON | VF_VENDOR); + return Version("Channel mode to delay rejoin after kick", VF_VENDOR); } }; diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 734a34b7a..16ad1f2a4 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -254,7 +254,7 @@ class ModuleMsgFlood : public Module Version GetVersion() { - return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR); + return Version("Provides channel mode +f (message flood protection)", VF_VENDOR); } }; diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp index a2b41bb90..e4f12c7bc 100644 --- a/src/modules/m_nickflood.cpp +++ b/src/modules/m_nickflood.cpp @@ -268,7 +268,7 @@ class ModuleNickFlood : public Module Version GetVersion() { - return Version("Channel mode F - nick flood protection", VF_COMMON | VF_VENDOR); + return Version("Channel mode F - nick flood protection", VF_VENDOR); } }; diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp index b9132964c..19f97b42c 100644 --- a/src/modules/m_noctcp.cpp +++ b/src/modules/m_noctcp.cpp @@ -65,7 +65,7 @@ class ModuleNoCTCP : public Module virtual Version GetVersion() { - return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR); + return Version("Provides support for unreal-style channel mode +C", VF_VENDOR); } virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp index 647f944bc..0d5a012ef 100644 --- a/src/modules/m_nokicks.cpp +++ b/src/modules/m_nokicks.cpp @@ -65,7 +65,7 @@ class ModuleNoKicks : public Module Version GetVersion() { - return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR); + return Version("Provides support for unreal-style channel mode +Q", VF_VENDOR); } }; diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index f736d9518..5fa5c3227 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -62,7 +62,7 @@ class ModuleNoNickChange : public Module virtual Version GetVersion() { - return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR); + return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR); } diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index 83eb744f2..fe1e0a46d 100644 --- a/src/modules/m_nonotice.cpp +++ b/src/modules/m_nonotice.cpp @@ -72,7 +72,7 @@ class ModuleNoNotice : public Module virtual Version GetVersion() { - return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR); + return Version("Provides support for unreal-style channel mode +T", VF_VENDOR); } }; diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index a98c5e01d..cacc206d6 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -290,7 +290,7 @@ class ModuleOjoin : public Module Version GetVersion() { - return Version("Network Buisness Join", VF_COMMON | VF_VENDOR); + return Version("Network Buisness Join", VF_VENDOR); } }; diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp index 264b54767..f31979cea 100644 --- a/src/modules/m_operchans.cpp +++ b/src/modules/m_operchans.cpp @@ -88,7 +88,7 @@ class ModuleOperChans : public Module Version GetVersion() { - return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR | VF_COMMON); + return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR); } }; diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index 2795d242a..b8835f798 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -112,7 +112,7 @@ class ModuleOperPrefixMode : public Module Version GetVersion() { - return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR); + return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR); } }; diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 4eed53747..fbbd38c15 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -295,7 +295,7 @@ public: virtual Version GetVersion() { - return Version("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR); + return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR); } virtual ModResult OnChannelPreDelete(Channel *c) diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 7cbe64567..eeca44e7d 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -126,7 +126,7 @@ class ModuleRedirect : public Module virtual Version GetVersion() { - return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR); + return Version("Provides channel mode +L (limit redirection)", VF_VENDOR); } }; diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 5464dbfb3..340246cc8 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -56,7 +56,7 @@ class ModuleServProtectMode : public Module Version GetVersion() { - return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_COMMON | VF_VENDOR); + return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_VENDOR); } void OnWhois(User* src, User* dst) diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp index d74d6f848..fe262134f 100644 --- a/src/modules/m_spanningtree/compat.cpp +++ b/src/modules/m_spanningtree/compat.cpp @@ -16,20 +16,55 @@ #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", - "m_regex_glob.so", - "m_regex_pcre.so", - "m_regex_posix.so", - "m_regex_tre.so" }; static std::string wide_newline("\r\n"); @@ -39,14 +74,6 @@ void TreeSocket::CompatAddModules(std::vector<std::string>& modlist) { if (proto_version < 1202) { - for(std::vector<std::string>::iterator i = modlist.begin(); i != modlist.end(); ++i) - { - if (*i == "m_halfop.so") - { - modlist.erase(i); - break; - } - } // you MUST have chgident loaded in order to be able to translate FIDENT modlist.push_back("m_chgident.so"); for(int i=0; i * sizeof(char*) < sizeof(forge_common_1201); i++) @@ -56,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"); + } } } diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index 2fb3802c8..a1a24d8ad 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -124,7 +124,7 @@ class ModuleSSLModes : public Module Version GetVersion() { - return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR); + return Version("Provides support for unreal-style channel mode +z", VF_VENDOR); } }; diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index ff944a4c1..adfc8d565 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -134,7 +134,7 @@ class ModuleStripColor : public Module virtual Version GetVersion() { - return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR); + return Version("Provides channel +S mode (strip ansi colour)", VF_VENDOR); } }; |