Replace some C-isms with C++-isms.

[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 9275152ea505dbba9368130cede3516697197e1a..6633e9582f7b3d284e61f880afedc4c867396f54 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
@@ -77,6 +110,7 @@ class HistoryMode : public ModeHandler
 class ModuleChanHistory : public Module
 {
        HistoryMode m;
+       bool sendnotice;
  public:
        ModuleChanHistory() : m(this)
        {
@@ -85,23 +119,21 @@ 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);
        }
 
        void OnRehash(User*)
        {
-               m.maxlines = ServerInstance->Config->ConfValue("chanhistory")->getInt("maxlines", 50);
-       }
-
-       ~ModuleChanHistory()
-       {
-               ServerInstance->Modes->DelMode(&m);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
+               m.maxlines = tag->getInt("maxlines", 50);
+               sendnotice = tag->getBool("notice", true);
        }
 
-       void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)
+       void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&)
        {
                if (target_type == TYPE_CHANNEL && status == 0)
                {
@@ -109,10 +141,8 @@ class ModuleChanHistory : public Module
                        HistoryList* list = m.ext.get(c);
                        if (list)
                        {
-                               char buf[MAXBUF];
-                               snprintf(buf, MAXBUF, ":%s PRIVMSG %s :%s",
-                                       user->GetFullHost().c_str(), c->name.c_str(), text.c_str());
-                               list->lines.push_back(HistoryItem(buf));
+                               const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + text;
+                               list->lines.push_back(HistoryItem(line));
                                if (list->lines.size() > list->maxlen)
                                        list->lines.pop_front();
                        }
@@ -121,14 +151,21 @@ class ModuleChanHistory : public Module
 
        void OnPostJoin(Membership* memb)
        {
+               if (IS_REMOTE(memb->user))
+                       return;
+
                HistoryList* list = m.ext.get(memb->chan);
                if (!list)
                        return;
                time_t mintime = 0;
                if (list->maxtime)
                        mintime = ServerInstance->Time() - list->maxtime;
-               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);
+
+               if (sendnotice)
+               {
+                       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)
                {
                        if (i->ts >= mintime)