m_spanningtree Remove public TreeServer methods that are only called from TreeServer

[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 5f288424ca685bc0c008452b404b0f695ce694f1..9630128e0b1716865df4ba028d9c263e4d4355d7 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -121,8 +121,10 @@ class AccountExtItemImpl : public AccountExtItem
                {
                        // Logged in
                        if (IS_LOCAL(user))
+                       {
                                user->WriteNumeric(900, "%s %s :You are now logged in as %s",
                                        user->GetFullHost().c_str(), value.c_str(), value.c_str());
+                       }
 
                        AccountEvent(creator, user, value).Send();
                }
@@ -142,9 +144,11 @@ class ModuleServicesAccount : public Module
        Channel_r m4;
        User_r m5;
        AccountExtItemImpl accountname;
+       bool checking_ban;
  public:
        ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
                accountname(this)
+               , checking_ban(false)
        {
        }
 
@@ -175,12 +179,7 @@ class ModuleServicesAccount : public Module
        {
                /* On nickchange, if they have +r, remove it */
                if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
-               {
-                       std::vector<std::string> modechange;
-                       modechange.push_back(user->nick);
-                       modechange.push_back("-r");
-                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
-               }
+                       m5.RemoveMode(user);
        }
 
        ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
@@ -219,8 +218,7 @@ class ModuleServicesAccount : public Module
 
        ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
        {
-               static bool checking = false;
-               if (checking)
+               if (checking_ban)
                        return MOD_RES_PASSTHRU;
 
                if ((mask.length() > 2) && (mask[1] == ':'))
@@ -240,9 +238,9 @@ class ModuleServicesAccount : public Module
 
                                /* If we made it this far we know the user isn't registered
                                        so just deny if it matches */
-                               checking = true;
+                               checking_ban = true;
                                bool result = chan->CheckBan(user, mask.substr(2));
-                               checking = false;
+                               checking_ban = false;
 
                                if (result)
                                        return MOD_RES_DENY;
@@ -288,4 +286,3 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
-