Extbans can be VF_OPTCOMMON as they do not desync on module add/remove

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12303 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 61c23bf62533fed7c41690254899617c943c7a0f..2e20fc27f65195a2e383b5b25b4961517b4d9410 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -12,17 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "xline.h"
-#include "socketengine.h"
-#include "socket.h"
-#include "command_parse.h"
-#include "exitcodes.h"
-
-/* Directory Searching for Unix-Only */
-#ifndef WIN32
-#include <dirent.h>
-#include <dlfcn.h>
-#endif
 
 int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
 {
@@ -204,10 +193,10 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 
        /* Modify the user's penalty regardless of whether or not the command exists */
        bool do_more = true;
-       if (IS_LOCAL(user) && !user->HasPrivPermission("users/flood/no-throttle"))
+       if (!user->HasPrivPermission("users/flood/no-throttle"))
        {
                // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
-               IS_LOCAL(user)->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000;
+               user->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000;
        }
 
 

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 8f70f7d20917cbcf5f0216fa59e21dad9c83b3c7..85f3fff7d18cc44523bf8e2c3d0d124ab9693782 100644 (file)
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -30,7 +30,7 @@ class ModuleBadChannelExtban : public Module
 
        Version GetVersion()
        {
-               return Version("Extban 'j' - channel status/join ban", VF_COMMON|VF_VENDOR);
+               return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)

diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 9e85fde4038cca9ca662961a9a9bb4e2979874be..446ac2475b7339db724622670062ff0e2c253542 100644 (file)
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -116,7 +116,7 @@ class ModuleCustomTitle : public Module
 
        Version GetVersion()
        {
-               return Version("Custom Title for users", VF_COMMON | VF_VENDOR);
+               return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index c60073b7000a108443acfa425a6da2effbf7de79..0f3c75f246f4f5352fb168808d2d917cba77f5e5 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -30,7 +30,7 @@ class ModuleGecosBan : public Module
 
        Version GetVersion()
        {
-               return Version("Extban 'r' - realname (gecos) ban", VF_COMMON|VF_VENDOR);
+               return Version("Extban 'r' - realname (gecos) ban", VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 2934fb0de017bbf365f96bbfe108c164fb10ce9d..f02f8a1b227fe3c5c0bdc960318006ca29d1015b 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -36,15 +36,10 @@ class CommandGlobops : public Command
                        line = line + parameters[i] + " ";
                }
                ServerInstance->SNO->WriteToSnoMask('g',line);
+               ServerInstance->PI->SendSNONotice("g", line);
 
-               /* route it (ofc :p) */
                return CMD_SUCCESS;
        }
-
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
-       {
-               return ROUTE_BROADCAST;
-       }
 };
 
 class ModuleGlobops : public Module
@@ -66,7 +61,7 @@ class ModuleGlobops : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for GLOBOPS and user mode +g", VF_COMMON | VF_VENDOR);
+               return Version("Provides support for GLOBOPS and user mode +g", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 3ae86de34d2d8839cd24539bf1324378a057be7d..30d08efb54a2eec48b43c38f752710508bee98f3 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -68,7 +68,7 @@ class CommandKnock : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               return ROUTE_BROADCAST;
+               return ROUTE_OPT_BCAST;
        }
 };
 
@@ -100,7 +100,7 @@ class ModuleKnock : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR);
+               return Version("Provides support for /KNOCK and mode +K", VF_OPTCOMMON | VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index daee818a99f73df02a1f9f3d8fb34e73f36d590f..1445889aebc3f3b56826a905b0dc83c75f0daec6 100644 (file)
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -30,7 +30,7 @@ class ModuleQuietBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Implements extban +b m: - mute bans",VF_COMMON|VF_VENDOR);
+               return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|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_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index 6f84122f479aea99b1f02f943a11717e211d4d42..51ee659cd6fb665faf467a5c982ca1714bb344fa 100644 (file)
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -31,7 +31,7 @@ class ModulePartMsgBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Implements extban +b p: - part message bans", VF_COMMON|VF_VENDOR);
+               return Version("Implements extban +b p: - part message bans", VF_OPTCOMMON|VF_VENDOR);
        }
 
 

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index 49fd4298fe759b79f47aafa0c719269bf851ae5b..1a3030c0be0a4355f28a7d25e7d9437ecbc71065 100644 (file)
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -30,7 +30,7 @@ class ModuleServerBan : public Module
 
        Version GetVersion()
        {
-               return Version("Extban 's' - server ban",VF_COMMON|VF_VENDOR);
+               return Version("Extban 's' - server ban",VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 069bcc83799a2171037f74136a550daa541aae00..3f1913de4ed7afb57d6d0be7adb013169e59361f 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -278,7 +278,7 @@ class ModuleServicesAccount : public Module
 
        Version GetVersion()
        {
-               return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_COMMON|VF_VENDOR);
+               return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 3194bb10308ee5dfcca5348b3f2f798d1ec85dc9..22155fd2ca3e829e0d8ec590d8f90e4336cd1f2b 100644 (file)
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -26,14 +26,18 @@ static const char* const forge_common_1201[] = {
        "m_censor.so",
        "m_chanfilter.so",
        "m_chanhistory.so",
+       "m_channelban.so",
        "m_chanprotect.so",
        "m_chghost.so",
        "m_chgname.so",
        "m_commonchans.so",
+       "m_customtitle.so",
        "m_deaf.so",
        "m_delayjoin.so",
        "m_delaymsg.so",
        "m_exemptchanops.so",
+       "m_gecosban.so",
+       "m_globops.so",
        "m_helpop.so",
        "m_hidechans.so",
        "m_hideoper.so",
@@ -41,13 +45,16 @@ static const char* const forge_common_1201[] = {
        "m_inviteexception.so",
        "m_joinflood.so",
        "m_kicknorejoin.so",
+       "m_knock.so",
        "m_messageflood.so",
+       "m_muteban.so",
        "m_nickflood.so",
        "m_nicklock.so",
        "m_noctcp.so",
        "m_nokicks.so",
        "m_nonicks.so",
        "m_nonotice.so",
+       "m_nopartmsg.so",
        "m_ojoin.so",
        "m_operprefix.so",
        "m_permchannels.so",
@@ -62,6 +69,8 @@ static const char* const forge_common_1201[] = {
        "m_sanick.so",
        "m_sapart.so",
        "m_saquit.so",
+       "m_serverban.so",
+       "m_services_account.so",
        "m_servprotect.so",
        "m_setident.so",
        "m_showwhois.so",
@@ -69,6 +78,7 @@ static const char* const forge_common_1201[] = {
        "m_sslmodes.so",
        "m_stripcolor.so",
        "m_swhois.so",
+       "m_uninvite.so",
        "m_watch.so"
 };
 

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 7b88e612442be1ebcf15b14932ee03b63ef6af76..cbddedd2b904579a60cea30ce249fbd888f53626 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -78,7 +78,7 @@ class CommandUninvite : public Command
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
                User* u = ServerInstance->FindNick(parameters[0]);
-               return u ? ROUTE_UNICAST(u->server) : ROUTE_LOCALONLY;
+               return u ? ROUTE_OPT_UCAST(u->server) : ROUTE_LOCALONLY;
        }
 };
 
@@ -99,7 +99,7 @@ class ModuleUninvite : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_COMMON);
+               return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON);
        }
 };