m_auditorium Handle NULL return from Channel::GetUser() in OnSendWhoLine()

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

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index ed5063fadc12880cce3d1d4e514e0c149409a436..6dbc0e7a860418d1154d36b00646d5bfa38040f4 100644 (file)
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -28,12 +28,14 @@ class ModuleChanLog : public Module
        /*
         * Multimap so people can redirect a snomask to multiple channels.
         */
-       std::multimap<char, std::string> logstreams;
+       typedef std::multimap<char, std::string> ChanLogTargets;
+       ChanLogTargets logstreams;
 
  public:
-       ModuleChanLog()         {
+       void init()
+       {
                Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
                OnRehash(NULL);
        }
@@ -44,16 +46,16 @@ class ModuleChanLog : public Module
 
        virtual void OnRehash(User *user)
        {
-               ConfigReader MyConf;
                std::string snomasks;
                std::string channel;
 
                logstreams.clear();
 
-               for (int i = 0; i < MyConf.Enumerate("chanlog"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       channel = MyConf.ReadValue("chanlog", "channel", i);
-                       snomasks = MyConf.ReadValue("chanlog", "snomasks", i);
+                       channel = i->second->getString("channel");
+                       snomasks = i->second->getString("snomasks");
 
                        if (channel.empty() || snomasks.empty())
                        {
@@ -72,30 +74,21 @@ class ModuleChanLog : public Module
 
        virtual ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
        {
-               std::multimap<char, std::string>::const_iterator it = logstreams.find(sno);
-               char buf[MAXBUF];
-
-               if (it == logstreams.end())
+               std::pair<ChanLogTargets::const_iterator, ChanLogTargets::const_iterator> itpair = logstreams.equal_range(sno);
+               if (itpair.first == itpair.second)
                        return MOD_RES_PASSTHRU;
 
+               char buf[MAXBUF];
                snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str());
 
-               while (it != logstreams.end())
+               for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
                {
-                       if (it->first != sno)
-                       {
-                               it++;
-                               continue;
-                       }
-
                        Channel *c = ServerInstance->FindChan(it->second);
                        if (c)
                        {
-                               c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "PRIVMSG %s :%s", c->name.c_str(), buf);
+                               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf);
                                ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
                        }
-
-                       it++;
                }
 
                return MOD_RES_PASSTHRU;
@@ -155,7 +148,7 @@ class ChannelLogStream : public LogStream
                        char buf[MAXBUF];
                        snprintf(buf, MAXBUF, "\2%s\2: %s", type.c_str(), msg.c_str());
 
-                       c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "PRIVMSG %s :%s", c->name.c_str(), buf);
+                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf);
                        ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
                        Logging = false;
                }