X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=6385af9c092ffe10565648203a1b12988346b628;hb=2cc6856e8709c9a5c339ab4af1c0d0b9a01ed917;hp=5ddfb3e1e493ba48523fcf2c26834fdfb46ba7a2;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 5ddfb3e1e..6385af9c0 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,9 +11,10 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDsnomasks */
+
+#include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
 #include "snomasks.h"
 
 SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
@@ -26,11 +27,20 @@ SnomaskManager::~SnomaskManager()
 {
 }
 
+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;
@@ -41,6 +51,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;
 	}
@@ -53,22 +64,13 @@ 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::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
-		{
-			userrec* a = *i;
-			if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE] && a->modes[UM_SNOMASK] && 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);
 	}
 }
 
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
 {
-        char textbuffer[MAXBUF];
+	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
 	va_start(argsPtr, text);
@@ -85,16 +87,57 @@ bool SnomaskManager::IsEnabled(char letter)
 
 void SnomaskManager::SetupDefaults()
 {
-	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('l',"LINK");		/* Link notices */
-	this->EnableSnomask('o',"OPER");		/* Oper up/down notices */
-	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 */
+	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");			/* 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", DEBUG, "Flushing snomask %s", this->Description.c_str());
+
+	/* 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++)
+	{
+		User* a = *i;
+		if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask) && !a->quitting)
+		{
+			a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str());
+			if (Count > 1)
+			{
+				a->WriteServ("NOTICE %s :*** %s: (last message repeated %u times)", a->nick, this->Description.c_str(), Count);
+			}
+		}
+	}
+
+	LastMessage = "";
+	Count = 1;
+}