* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include <stdarg.h>
#include "snomasks.h"
-SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
+SnomaskManager::SnomaskManager()
{
SnoMasks.clear();
this->SetupDefaults();
{
if (SnoMasks.find(letter) == SnoMasks.end())
{
- Snomask *s = new Snomask(ServerInstance, letter, type);
+ Snomask *s = new Snomask(letter, type);
SnoMasks[letter] = s;
return true;
}
}
}
+void SnomaskManager::WriteGlobalSno(char letter, const std::string& text)
+{
+ WriteToSnoMask(letter, text);
+ letter = toupper(letter);
+ ServerInstance->PI->SendSNONotice(std::string(1, letter), text);
+}
+
void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
{
char textbuffer[MAXBUF];
this->WriteToSnoMask(letter, std::string(textbuffer));
}
+void SnomaskManager::WriteGlobalSno(char letter, const char* text, ...)
+{
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ this->WriteGlobalSno(letter, std::string(textbuffer));
+}
+
bool SnomaskManager::IsEnabled(char letter)
{
return (SnoMasks.find(letter) != SnoMasks.end());
this->EnableSnomask('L',"REMOTELINK"); /* Remote linking notices */
this->EnableSnomask('o',"OPER"); /* Oper up/down notices */
this->EnableSnomask('O',"REMOTEOPER"); /* Remote 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('A',"REMOTEANNOUNCEMENT"); /* 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('X',"REMOTEXLINE"); /* Remove Xline notice (g/z/q/k/e) */
this->EnableSnomask('t',"STATS"); /* Local or remote stats request */
this->EnableSnomask('f',"FLOOD"); /* Flooding notices */
}
LastMessage = message;
std::string desc = this->Description;
- int MOD_RESULT = 0;
+ ModResult MOD_RESULT;
char mysnomask = MySnomask;
ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
- FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, message));
+ FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
- LastBlocked = (MOD_RESULT == 1); // 1 blocks the message
+ LastBlocked = (MOD_RESULT == MOD_RES_DENY);
if (!LastBlocked)
{
{
if (Count > 1)
{
- ServerInstance->Logs->Log("snomask", DEFAULT, "%s: (last message repeated %u times)", this->Description.c_str(), Count);
+ std::string desc = this->Description;
+ std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)";
+ char mysnomask = MySnomask;
+
+ ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), mesg.c_str());
+
+ FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, mesg));
+
if (!LastBlocked)
{
/* Only opers can receive snotices, so we iterate the oper list */
while (i != ServerInstance->Users->all_opers.end())
{
User* a = *i;
- if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(MySnomask) && !a->quitting)
+ 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(), mesg.c_str());
}
i++;