Use the error name constants here now rather than magic numbers. magic numbers blow...

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

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 136947107e98ac30885d0697c2463f5a3ff761e6..5f04931f991cb3335e7d4a7dbe3f678ec2ad45ce 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsnomasks */
+/* $Core */
 
 #include "inspircd.h"
 #include <stdarg.h>
@@ -24,12 +24,16 @@ SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
 }
 
 SnomaskManager::~SnomaskManager()
-{
+{      
+       for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
+       {
+               delete i->second;
+       }
+       SnoMasks.clear();
 }
 
 void SnomaskManager::FlushSnotices()
 {
-       // stub.. not yet written XXX
        for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
        {
                i->second->Flush();
@@ -96,6 +100,7 @@ void SnomaskManager::SetupDefaults()
        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,19 +127,36 @@ void Snomask::Flush()
        if (this->LastMessage.empty())
                return;
 
-       ServerInstance->Log(DEBUG, "Flusing snomask %s", this->Description.c_str());
+       ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", this->Description.c_str(), this->LastMessage.c_str());
+       if (Count > 1)
+               ServerInstance->Logs->Log("snomask", DEFAULT, "%s: (last message repeated %u times)", this->Description.c_str(), Count);
+
 
-       /* 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++)
+       int MOD_RESULT = 0;
+       char mysnomask = MySnomask;
+       std::string desc = this->Description;
+
+       FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, this->LastMessage));
+
+       if (MOD_RESULT != 1) // 1 blocks the message
        {
-               User* a = *i;
-               if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask))
+               /* Only opers can receive snotices, so we iterate the oper list */
+               std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin();
+
+               while (i != ServerInstance->Users->all_opers.end())
                {
-                       a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str());
-                       if (Count > 1)
+                       User* a = *i;
+                       if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(mysnomask) && !a->quitting)
                        {
-                               a->WriteServ("NOTICE %s :*** %s: (last message repeated %u times)", a->nick, this->Description.c_str(), Count);
+
+                               a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), this->LastMessage.c_str());
+                               if (Count > 1)
+                               {
+                                       a->WriteServ("NOTICE %s :*** %s: (last message repeated %u times)", a->nick.c_str(), this->Description.c_str(), Count);
+                               }
                        }
+
+                       i++;
                }
        }