Merge pull request #495 from SaberUK/master+fix-libcpp

[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 f6454a6224479829b59d495eb82e38856572326a..036fc1df6c4ba043a575dfa6297596c90048b772 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -37,9 +37,23 @@ struct HistoryList
 
 class HistoryMode : public ModeHandler
 {
+       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'))
+                               continue;
+
+                       if (duration_multi[c] == 1)
+                               return false;
+               }
+               return true;
+       }
+
  public:
        SimpleExtItem<HistoryList> ext;
-       int maxlines;
+       unsigned int maxlines;
        HistoryMode(Module* Creator) : ModeHandler(Creator, "history", 'H', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("history", Creator) { }
 
@@ -50,9 +64,14 @@ class HistoryMode : public ModeHandler
                        std::string::size_type colon = parameter.find(':');
                        if (colon == std::string::npos)
                                return MODEACTION_DENY;
-                       int len = atoi(parameter.substr(0, colon).c_str());
-                       int time = ServerInstance->Duration(parameter.substr(colon+1));
-                       if (len <= 0 || time < 0)
+
+                       std::string duration = parameter.substr(colon+1);
+                       if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!IsValidDuration(duration))))
+                               return MODEACTION_DENY;
+
+                       unsigned int len = ConvToInt(parameter.substr(0, colon));
+                       int time = InspIRCd::Duration(duration);
+                       if (len == 0 || time < 0)
                                return MODEACTION_DENY;
                        if (len > maxlines && IS_LOCAL(source))
                                return MODEACTION_DENY;
@@ -60,7 +79,21 @@ class HistoryMode : public ModeHandler
                                len = maxlines;
                        if (parameter == channel->GetModeParameter(this))
                                return MODEACTION_DENY;
-                       ext.set(channel, new HistoryList(len, time));
+
+                       HistoryList* history = ext.get(channel);
+                       if (history)
+                       {
+                               // Shrink the list if the new line number limit is lower than the old one
+                               if (len < history->lines.size())
+                                       history->lines.erase(history->lines.begin(), history->lines.begin() + (history->lines.size() - len));
+
+                               history->maxlen = len;
+                               history->maxtime = time;
+                       }
+                       else
+                       {
+                               ext.set(channel, new HistoryList(len, time));
+                       }
                        channel->SetModeParam('H', parameter);
                }
                else
@@ -86,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);
        }
 
@@ -96,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&)