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 e6323b50c743271fd41a1108409c03cea3d8b6e0..5f04931f991cb3335e7d4a7dbe3f678ec2ad45ce 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsnomasks */
+/* $Core */
 
 #include "inspircd.h"
 #include <stdarg.h>
@@ -40,11 +40,11 @@ void SnomaskManager::FlushSnotices()
        }
 }
 
-bool SnomaskManager::EnableSnomask(char letter, const std::string &type, bool local)
+bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
 {
        if (SnoMasks.find(letter) == SnoMasks.end())
        {
-               Snomask *s = new Snomask(ServerInstance, letter, type, local);
+               Snomask *s = new Snomask(ServerInstance, letter, type);
                SnoMasks[letter] = s;
                return true;
        }
@@ -92,15 +92,15 @@ bool SnomaskManager::IsEnabled(char letter)
 
 void SnomaskManager::SetupDefaults()
 {
-       this->EnableSnomask('c',"CONNECT", true);                       /* Local connect notices */
-       this->EnableSnomask('C',"REMOTECONNECT");               /* Remote connect notices */
-       this->EnableSnomask('q',"QUIT", true);                  /* Local quit notices */
-       this->EnableSnomask('Q',"REMOTEQUIT");                  /* Remote quit notices */
-       this->EnableSnomask('k',"KILL", true);                  /* Kill notices */
-       this->EnableSnomask('K',"REMOTEKILL");                  /* Remote kill notices */
+       this->EnableSnomask('c',"CONNECT");                     /* Local 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('k',"KILL");                        /* 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('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 */
@@ -127,30 +127,37 @@ void Snomask::Flush()
        if (this->LastMessage.empty())
                return;
 
-       /* Only opers can receive snotices, so we iterate the oper list */
-       for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
+       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);
+
+
+       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) && !a->quitting)
-               {
+               /* Only opers can receive snotices, so we iterate the oper list */
+               std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin();
 
-                       a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str());
-                       if (Count > 1)
+               while (i != ServerInstance->Users->all_opers.end())
+               {
+                       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);
-                       }
-               }
-       }
 
-       if (!LocalOnly)
-       {
-               // XXX this is a bit ugly.
-               std::string sno;
-               sno[0] = MySnomask;
+                               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);
+                               }
+                       }
 
-               ServerInstance->PI->SendSNONotice(sno, this->Description + ": " + this->LastMessage);
-               if (Count > 1)
-                       ServerInstance->PI->SendSNONotice(sno, this->Description + ": (last message repeated " + ConvToStr(Count) + " times)");
+                       i++;
+               }
        }
 
        LastMessage = "";