X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=c166bd72d3a52869baa755eb534ae3e90b8e095c;hb=692b4549704a02791df1150e09aa0a225d288d7e;hp=de900623d48113e2331ac642ff80af23962429dd;hpb=57542f8488ce9f3250915d6c2aa03c243e34b7b3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index de900623d..c166bd72d 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsnomasks */
+/* $Core */
 
 #include "inspircd.h"
 #include <stdarg.h>
@@ -25,6 +25,11 @@ 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()
@@ -35,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;
 	}
@@ -87,15 +92,17 @@ 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('l',"LINK");			/* Link 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");			/* Linking notices */
+	this->EnableSnomask('L',"REMOTELINK");			/* Remote linking notices */
 	this->EnableSnomask('o',"OPER");			/* Oper up/down notices */
-	this->EnableSnomask('A',"ANNOUNCEMENT");		/* formerly WriteOpers() - generic notices to all opers */
+	this->EnableSnomask('O',"REMOTEOPER");			/* Remote 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,30 +129,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 = "";