Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 64e573286b308bb0ffb4c83b31e5cd1c32fab02a..e48e67fe5557ffb601425de6dde5ceba787e3b7b 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -37,12 +37,12 @@ struct HistoryList
 
 class HistoryMode : public ModeHandler
 {
-       bool IsValidDuration(const std::string duration)
+       bool IsValidDuration(const std::string& duration)
        {
                for (std::string::const_iterator i = duration.begin(); i != duration.end(); ++i)
                {
                        unsigned char c = *i;
-                       if (((c >= '0') && (c <= '9')) || (c == 's') || (c != 'S'))
+                       if (((c >= '0') && (c <= '9')) || (c == 's') || (c == 'S'))
                                continue;
 
                        if (duration_multi[c] == 1)
@@ -119,9 +119,10 @@ class ModuleChanHistory : public Module
        void init()
        {
                ServerInstance->Modules->AddService(m);
+               ServerInstance->Modules->AddService(m.ext);
 
                Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -129,7 +130,7 @@ class ModuleChanHistory : public Module
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
                m.maxlines = tag->getInt("maxlines", 50);
-               sendnotice = tag->getInt("notice", true);
+               sendnotice = tag->getBool("notice", true);
        }
 
        void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)