Add method for writing server notices.

[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 482d526ebc3e05d9e413c4521617733a8bfc4c87..3ee823b4a99c82d906036df2b00b8b6d044a37c4 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)
@@ -70,7 +70,7 @@ class HistoryMode : public ModeHandler
                                return MODEACTION_DENY;
 
                        unsigned int len = ConvToInt(parameter.substr(0, colon));
-                       int time = ServerInstance->Duration(duration);
+                       int time = InspIRCd::Duration(duration);
                        if (len == 0 || time < 0)
                                return MODEACTION_DENY;
                        if (len > maxlines && IS_LOCAL(source))
@@ -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,12 +130,7 @@ class ModuleChanHistory : public Module
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
                m.maxlines = tag->getInt("maxlines", 50);
-               sendnotice = tag->getInt("notice", true);
-       }
-
-       ~ModuleChanHistory()
-       {
-               ServerInstance->Modes->DelMode(&m);
+               sendnotice = tag->getBool("notice", true);
        }
 
        void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)
@@ -169,8 +165,7 @@ class ModuleChanHistory : public Module
 
                if (sendnotice)
                {
-                       memb->user->WriteServ("NOTICE %s :Replaying up to %d lines of pre-join history spanning up to %d seconds",
-                               memb->chan->name.c_str(), list->maxlen, list->maxtime);
+                       memb->user->WriteNotice("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history spanning up to " + ConvToStr(list->maxtime) + " seconds");
                }
 
                for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)