Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

[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 f618a539cc098e920acd51042b1d1fca02ad4595..64b79a39ede443f86aea5dd173c1e5c5a209910e 100644 (file)
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -33,8 +33,7 @@ class ModuleChanLog : public Module
        {
                std::string snomasks;
                std::string channel;
-
-               logstreams.clear();
+               ChanLogTargets newlogs;
 
                ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
                for (ConfigIter i = tags.first; i != tags.second; ++i)
@@ -44,16 +43,16 @@ class ModuleChanLog : public Module
 
                        if (channel.empty() || snomasks.empty())
                        {
-                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Malformed chanlog tag, ignoring");
-                               continue;
+                               throw ModuleException("Malformed chanlog tag at " + i->second->getTagLocation());
                        }
 
                        for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++)
                        {
-                               logstreams.insert(std::make_pair(*it, channel));
+                               newlogs.insert(std::make_pair(*it, channel));
                                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str());
                        }
                }
+               logstreams.swap(newlogs);
 
        }
 
@@ -63,14 +62,15 @@ class ModuleChanLog : public Module
                if (itpair.first == itpair.second)
                        return MOD_RES_PASSTHRU;
 
-               const std::string snotice = "\2" + desc + "\2: " + msg;
+               const std::string snotice = "\002" + desc + "\002: " + msg;
 
                for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
                {
                        Channel *c = ServerInstance->FindChan(it->second);
                        if (c)
                        {
-                               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), snotice.c_str());
+                               ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->Config->ServerName, c, snotice);
+                               c->Write(ServerInstance->GetRFCEvents().privmsg, privmsg);
                                ServerInstance->PI->SendMessage(c, 0, snotice);
                        }
                }
@@ -80,7 +80,7 @@ class ModuleChanLog : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Logs snomask output to channel(s).", VF_VENDOR);
+               return Version("Logs snomask output to channel(s)", VF_VENDOR);
        }
 };