summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-08-22 20:07:48 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-08-22 20:07:48 +0000
commitae2c05c3170f0a83f40d71e3f5079e66f35a6f8a (patch)
treef79bb5afe1b5440adaf2ea054c8afe178cb977f4
parentdab0a575e232d4fa0f50615424d02fd1e0ba369b (diff)
Actually call OnSendSnotice event.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10224 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/snomasks.cpp30
1 files changed, 22 insertions, 8 deletions
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index a29f88aab..5f04931f9 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -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++;
}
}