Replace OnRehash() with ReadConfig() that is called on boot, on module load and on...

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 5a18730af976d90891e8cbd8383398d9a93a969c..de74773ad5784c9d9ff8556bf0868805b25eab4f 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -363,14 +363,9 @@ public:
 
        void init() CXX11_OVERRIDE
        {
-               OnRehash(NULL);
-
                ServerInstance->Modules->AddService(myumode);
                ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(cmd.extInfo);
-
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreMessage };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -430,7 +425,7 @@ public:
                RemoveFromAllAccepts(user);
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
                cmd.maxaccepts = tag->getInt("maxaccepts", 16);