m_exemptchanops Fix parameter validation

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

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 99e525398ba00075e0fd15a37bc23619c9b9f99f..0650cb3d000b004d704f15325f61b912cea5290a 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -26,14 +26,11 @@
    by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */
 
 #include "inspircd.h"
-#include "caller.h"
 #include <fstream>
 
 class lwbNickHandler : public HandlerBase1<bool, const std::string&>
 {
  public:
-       lwbNickHandler() { }
-       ~lwbNickHandler() { }
        bool Call(const std::string&);
 };
 
@@ -239,8 +236,6 @@ class ModuleNationalChars : public Module
                national_case_insensitive_map = m_lower;
 
                ServerInstance->IsNick = &myhandler;
-
-               OnRehash(NULL);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -248,7 +243,7 @@ class ModuleNationalChars : public Module
                tokens["CASEMAPPING"] = casemapping;
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
                charset = tag->getString("file");
@@ -266,7 +261,8 @@ class ModuleNationalChars : public Module
                if (!forcequit)
                        return;
 
-               for (LocalUserList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
                {
                        /* Fix by Brain: Dont quit UID users */
                        User* n = *iter;