Get rid of the OnRemoteKill hook, make use of GetRouting() and TR_CUSTOM to route...

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 62e96ca7c686fa5809a0b87c33b627a72a2ff9f8..e42c02ff2b63a523049450cf6fadc5784bdcc737 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -25,7 +25,7 @@
 /* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
 
 #include "inspircd.h"
-#include "account.h"
+#include "modules/account.h"
 
 /** Channel mode +r - mark a channel as identified
  */
@@ -37,7 +37,7 @@ class Channel_r : public ModeHandler
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                // only a u-lined server may add or remove the +r mode.
-               if (!IS_LOCAL(source) || ServerInstance->ULine(source->server))
+               if (!IS_LOCAL(source))
                {
                        // Only change the mode if it's not redundant
                        if ((adding != channel->IsModeSet('r')))
@@ -64,7 +64,7 @@ class User_r : public ModeHandler
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               if (!IS_LOCAL(source) || ServerInstance->ULine(source->server))
+               if (!IS_LOCAL(source))
                {
                        if ((adding != dest->IsModeSet('r')))
                        {
@@ -118,24 +118,24 @@ class ModuleServicesAccount : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
                ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
-               Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
+               Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreJoin, I_OnCheckBan,
                        I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
 
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       void On005Numeric(std::string &t)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('R');
-               ServerInstance->AddExtBanChar('U');
+               tokens["EXTBAN"].push_back('R');
+               tokens["EXTBAN"].push_back('U');
        }
 
        /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
-       void OnWhois(User* source, User* dest)
+       void OnWhois(User* source, User* dest) CXX11_OVERRIDE
        {
                std::string *account = accountname.get(dest);
 
@@ -151,7 +151,7 @@ class ModuleServicesAccount : public Module
                }
        }
 
-       void OnUserPostNick(User* user, const std::string &oldnick)
+       void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
        {
                /* On nickchange, if they have +r, remove it */
                if (user->IsModeSet('r') && assign(user->nick) != oldnick)
@@ -163,7 +163,7 @@ class ModuleServicesAccount : public Module
                }
        }
 
-       ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
        {
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
@@ -171,12 +171,6 @@ class ModuleServicesAccount : public Module
                std::string *account = accountname.get(user);
                bool is_registered = account && !account->empty();
 
-               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-               {
-                       // user is ulined, can speak regardless
-                       return MOD_RES_PASSTHRU;
-               }
-
                if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)dest;
@@ -203,7 +197,7 @@ class ModuleServicesAccount : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
+       ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
        {
                static bool checking = false;
                if (checking)
@@ -240,27 +234,13 @@ class ModuleServicesAccount : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
-       }
-
-       ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               if (!IS_LOCAL(user))
-                       return MOD_RES_PASSTHRU;
-
                std::string *account = accountname.get(user);
                bool is_registered = account && !account->empty();
 
                if (chan)
                {
-                       if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-                       {
-                               // user is ulined, won't be stopped from joining
-                               return MOD_RES_PASSTHRU;
-                       }
-
                        if (chan->IsModeSet('R'))
                        {
                                if (!is_registered)
@@ -281,7 +261,7 @@ class ModuleServicesAccount : public Module
        // In our case we're only sending a single string around, so we just construct a std::string.
        // Some modules will probably get much more complex and format more detailed structs and classes
        // in a textual way for sending over the link.
-       void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
+       void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) CXX11_OVERRIDE
        {
                User* dest = dynamic_cast<User*>(target);
                // check if its our metadata key, and its associated with a user
@@ -305,14 +285,14 @@ class ModuleServicesAccount : public Module
                }
        }
 
-       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
        {
                if (myclass->config->getBool("requireaccount") && !accountname.get(user))
                        return MOD_RES_DENY;
                return MOD_RES_PASSTHRU;
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR);
        }