From 92974819e3bf1c3a97b83f6f4ccc612283120794 Mon Sep 17 00:00:00 2001 From: danieldg Date: Sun, 17 Jan 2010 16:00:02 +0000 Subject: Change more modules to VF_OPTCOMMON and assert identical charsets in m_nationalchars git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12277 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_alltime.cpp | 4 ++-- src/modules/m_nationalchars.cpp | 2 +- src/modules/m_nicklock.cpp | 2 +- src/modules/m_showwhois.cpp | 12 +++++++----- src/modules/m_spanningtree/compat.cpp | 3 +++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 779fe38ac..ba7b39421 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -40,7 +40,7 @@ class CommandAlltime : public Command RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - return ROUTE_BROADCAST; + return ROUTE_OPT_BCAST; } }; @@ -61,7 +61,7 @@ class Modulealltime : public Module virtual Version GetVersion() { - return Version("Display timestamps from all servers connected to the network", VF_COMMON | VF_VENDOR); + return Version("Display timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR); } }; diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index a587350d0..642145add 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -276,7 +276,7 @@ class ModuleNationalChars : public Module virtual Version GetVersion() { - return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON); + return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING", VF_VENDOR | VF_COMMON, charset); } /*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/ diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index f4e847875..f413696dc 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -166,7 +166,7 @@ class ModuleNickLock : public Module Version GetVersion() { - return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_COMMON | VF_VENDOR); + return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 9cfa76008..2b27de388 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -65,9 +65,10 @@ class WhoisNoticeCmd : public Command CmdResult Handle(const std::vector ¶meters, User *user) { User* dest = ServerInstance->FindNick(parameters[0]); + User* source = ServerInstance->FindNick(parameters[1]); - if (IS_LOCAL(dest)) - HandleFast(dest, user); + if (IS_LOCAL(dest) && source) + HandleFast(dest, source); return CMD_SUCCESS; } @@ -100,12 +101,12 @@ class ModuleShowwhois : public Module delete sw; } - virtual Version GetVersion() + Version GetVersion() { - return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR); + return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR); } - virtual void OnWhois(User* source, User* dest) + void OnWhois(User* source, User* dest) { if (!dest->IsModeSet('W') || source == dest) return; @@ -122,6 +123,7 @@ class ModuleShowwhois : public Module std::vector params; params.push_back(dest->server); params.push_back("WHOISNOTICE"); + params.push_back(source->uuid); params.push_back(dest->uuid); ServerInstance->PI->SendEncapsulatedData(params); } diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp index a11db8215..3194bb103 100644 --- a/src/modules/m_spanningtree/compat.cpp +++ b/src/modules/m_spanningtree/compat.cpp @@ -17,6 +17,7 @@ static const char* const forge_common_1201[] = { "m_allowinvite.so", + "m_alltime.so", "m_auditorium.so", "m_banexception.so", "m_blockcaps.so", @@ -42,6 +43,7 @@ static const char* const forge_common_1201[] = { "m_kicknorejoin.so", "m_messageflood.so", "m_nickflood.so", + "m_nicklock.so", "m_noctcp.so", "m_nokicks.so", "m_nonicks.so", @@ -62,6 +64,7 @@ static const char* const forge_common_1201[] = { "m_saquit.so", "m_servprotect.so", "m_setident.so", + "m_showwhois.so", "m_silence.so", "m_sslmodes.so", "m_stripcolor.so", -- cgit v1.2.3