Fix peavey and w00ts bug they found by removing the nonblocking part of the logger...

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 136947107e98ac30885d0697c2463f5a3ff761e6..6385af9c092ffe10565648203a1b12988346b628 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -29,7 +29,6 @@ SnomaskManager::~SnomaskManager()
 
 void SnomaskManager::FlushSnotices()
 {
-       // stub.. not yet written XXX
        for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
        {
                i->second->Flush();
@@ -89,13 +88,14 @@ bool SnomaskManager::IsEnabled(char letter)
 void SnomaskManager::SetupDefaults()
 {
        this->EnableSnomask('c',"CONNECT");                     /* Local connect notices */
-       this->EnableSnomask('C',"REMOTECONNECT");       /* Remote connect notices */
+       this->EnableSnomask('C',"REMOTECONNECT");               /* Remote connect notices */
        this->EnableSnomask('q',"QUIT");                        /* Local quit notices */
-       this->EnableSnomask('Q',"REMOTEQUIT");          /* Remote quit notices */
+       this->EnableSnomask('Q',"REMOTEQUIT");                  /* Remote quit notices */
        this->EnableSnomask('k',"KILL");                        /* Kill notices */
-       this->EnableSnomask('K',"REMOTEKILL");          /* Remote kill notices */
+       this->EnableSnomask('K',"REMOTEKILL");                  /* Remote kill notices */
        this->EnableSnomask('l',"LINK");                        /* Link notices */
        this->EnableSnomask('o',"OPER");                        /* Oper up/down notices */
+       this->EnableSnomask('A',"ANNOUNCEMENT");                /* formerly WriteOpers() - generic notices to all opers */
        this->EnableSnomask('d',"DEBUG");                       /* Debug notices */
        this->EnableSnomask('x',"XLINE");                       /* Xline notice (g/z/q/k/e) */
        this->EnableSnomask('t',"STATS");                       /* Local or remote stats request */
@@ -122,13 +122,13 @@ void Snomask::Flush()
        if (this->LastMessage.empty())
                return;
 
-       ServerInstance->Log(DEBUG, "Flusing snomask %s", this->Description.c_str());
+       ServerInstance->Logs->Log("SNOMASK", DEBUG, "Flushing snomask %s", this->Description.c_str());
 
        /* Only opers can receive snotices, so we iterate the oper list */
-       for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+       for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
        {
                User* a = *i;
-               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask))
+               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask) && !a->quitting)
                {
                        a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str());
                        if (Count > 1)