X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=c166bd72d3a52869baa755eb534ae3e90b8e095c;hb=d6501677e1a66e4b438815e67b705eb26b68a4bc;hp=f4dfdc1e117376b569f13a896ae56c33edf83f16;hpb=1fa86207eda4c5eee0547beb5cb2b94a16a05609;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index f4dfdc1e1..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>
@@ -24,7 +24,7 @@ SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
 }
 
 SnomaskManager::~SnomaskManager()
-{	
+{
 	for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
 	{
 		delete i->second;
@@ -98,8 +98,10 @@ void SnomaskManager::SetupDefaults()
 	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('l',"LINK");			/* Linking notices */
+	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('d',"DEBUG");			/* Debug notices */
 	this->EnableSnomask('x',"XLINE");			/* Xline notice (g/z/q/k/e) */
@@ -131,18 +133,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->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);
+
+				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++;
 		}
 	}