X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=5f04931f991cb3335e7d4a7dbe3f678ec2ad45ce;hb=b708dff6d2897271321764117582a47699e72876;hp=df524b51f10f6b51b8614932172770220cf50710;hpb=2be86e1958ca8de8aaad54f75a8d6afec59d49af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index df524b51f..5f04931f9 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd.h"
 #include <stdarg.h>
 #include "snomasks.h"
@@ -22,14 +24,28 @@ 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()
 {
+	for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
+	{
+		i->second->Flush();
+	}
 }
 
 bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
 {
 	if (SnoMasks.find(letter) == SnoMasks.end())
 	{
-		SnoMasks[letter] = type;
+		Snomask *s = new Snomask(ServerInstance, letter, type);
+		SnoMasks[letter] = s;
 		return true;
 	}
 	return false;
@@ -40,6 +56,7 @@ bool SnomaskManager::DisableSnomask(char letter)
 	SnoList::iterator n = SnoMasks.find(letter);
 	if (n != SnoMasks.end())
 	{
+		delete n->second; // destroy the snomask
 		SnoMasks.erase(n);
 		return true;
 	}
@@ -52,16 +69,7 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
 	SnoList::iterator n = SnoMasks.find(letter);
 	if (n != SnoMasks.end())
 	{
-		/* Only opers can receive snotices, so we iterate the oper list */
-		for (std::list<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
-		{
-			userrec* a = *i;
-			if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(n->first))
-			{
-				/* send server notices to all with +ns */
-				a->WriteServ("NOTICE %s :*** %s: %s",a->nick, n->second.c_str(), text.c_str());
-			}
-		}
+		n->second->SendMessage(text);
 	}
 }
 
@@ -92,9 +100,66 @@ void SnomaskManager::SetupDefaults()
 	this->EnableSnomask('K',"REMOTEKILL");		/* Remote kill notices */
 	this->EnableSnomask('l',"LINK");			/* Link notices */
 	this->EnableSnomask('o',"OPER");			/* 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 */
 	this->EnableSnomask('f',"FLOOD");			/* Flooding notices */
 }
 
+/*************************************************************************************/
+
+void Snomask::SendMessage(const std::string &message)
+{
+	if (message != LastMessage)
+	{
+		this->Flush();
+		LastMessage = message;
+	}
+	else
+	{
+		Count++;
+	}
+}
+
+void Snomask::Flush()
+{
+	if (this->LastMessage.empty())
+		return;
+
+	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
+	{
+		/* Only opers can receive snotices, so we iterate the oper list */
+		std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin();
+
+		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: %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++;
+		}
+	}
+
+	LastMessage = "";
+	Count = 1;
+}