m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[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 bb4dc5eccbd82087cb308d216923fe7c654a59b8..4f2125a975616cfc3b80d6dc7e947d43b0b8563b 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -22,8 +22,6 @@
  */
 
 
-/* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
-
 #include "inspircd.h"
 #include "modules/account.h"
 
@@ -40,9 +38,9 @@ class Channel_r : public ModeHandler
                if (!IS_LOCAL(source))
                {
                        // Only change the mode if it's not redundant
-                       if ((adding != channel->IsModeSet('r')))
+                       if ((adding != channel->IsModeSet(this)))
                        {
-                               channel->SetMode('r',adding);
+                               channel->SetMode(this, adding);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -66,9 +64,9 @@ class User_r : public ModeHandler
        {
                if (!IS_LOCAL(source))
                {
-                       if ((adding != dest->IsModeSet('r')))
+                       if ((adding != dest->IsModeSet(this)))
                        {
-                               dest->SetMode('r',adding);
+                               dest->SetMode(this, adding);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -122,10 +120,6 @@ class ModuleServicesAccount : public Module
        {
                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,
-                       I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
-
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -144,7 +138,7 @@ class ModuleServicesAccount : public Module
                        ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick.c_str(), dest->nick.c_str(), account->c_str());
                }
 
-               if (dest->IsModeSet('r'))
+               if (dest->IsModeSet(m5))
                {
                        /* user is registered */
                        ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str());
@@ -154,16 +148,16 @@ class ModuleServicesAccount : public Module
        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)
+               if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
                {
                        std::vector<std::string> modechange;
                        modechange.push_back(user->nick);
                        modechange.push_back("-r");
-                       ServerInstance->SendMode(modechange, ServerInstance->FakeClient);
+                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
                }
        }
 
-       ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) CXX11_OVERRIDE
+       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;
@@ -176,7 +170,7 @@ class ModuleServicesAccount : public Module
                        Channel* c = (Channel*)dest;
                        ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated");
 
-                       if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
+                       if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW)
                        {
                                // user messaging a +M channel and is not registered
                                user->WriteNumeric(477, user->nick+" "+c->name+" :You need to be identified to a registered account to message this channel");
@@ -187,7 +181,7 @@ class ModuleServicesAccount : public Module
                {
                        User* u = (User*)dest;
 
-                       if (u->IsModeSet('R') && !is_registered)
+                       if (u->IsModeSet(m3) && !is_registered)
                        {
                                // user messaging a +R user and is not registered
                                user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
@@ -234,11 +228,6 @@ 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) CXX11_OVERRIDE
-       {
-               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
-       }
-
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
                std::string *account = accountname.get(user);
@@ -246,7 +235,7 @@ class ModuleServicesAccount : public Module
 
                if (chan)
                {
-                       if (chan->IsModeSet('R'))
+                       if (chan->IsModeSet(m1))
                        {
                                if (!is_registered)
                                {