]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Actually call OnSendSnotice event.
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Fri, 22 Aug 2008 20:07:48 +0000 (20:07 +0000)
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Fri, 22 Aug 2008 20:07:48 +0000 (20:07 +0000)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10224 e03df62e-2008-0410-955e-edbf42e46eb7

src/snomasks.cpp

index a29f88aabed286b9b9be34b9c6b036bc2b2c2d93..5f04931f991cb3335e7d4a7dbe3f678ec2ad45ce 100644 (file)
@@ -131,18 +131,32 @@ void Snomask::Flush()
        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->Users->all_opers.begin(); i != ServerInstance->Users->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->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.c_str(), 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.c_str(), 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++;
                }
        }