X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=742214a6d60888c24646689105bcaa580e21b6e7;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=070d01d7346283d2efd4477cce6f2db3059f2d69;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 070d01d73..742214a6d 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,11 +11,13 @@
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd.h"
 #include <stdarg.h>
 #include "snomasks.h"
 
-SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
+SnomaskManager::SnomaskManager()
 {
 	SnoMasks.clear();
 	this->SetupDefaults();
@@ -23,13 +25,27 @@ 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(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,19 +69,17 @@ 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<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
-		{
-			User* 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);
 	}
 }
 
+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];
@@ -77,6 +92,18 @@ void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
 	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());
@@ -90,11 +117,88 @@ 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('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 */
 }
 
+/*************************************************************************************/
+
+void Snomask::SendMessage(const std::string &message)
+{
+	if (message != LastMessage)
+	{
+		this->Flush();
+		LastMessage = message;
+
+		std::string desc = this->Description;
+		ModResult MOD_RESULT;
+		char mysnomask = MySnomask;
+		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
+
+		FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
+
+		LastBlocked = (MOD_RESULT == MOD_RES_DENY);
+
+		if (!LastBlocked)
+		{
+			/* 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(), message.c_str());
+				}
+
+				i++;
+			}
+		}
+	}
+	Count++;
+}
+
+void Snomask::Flush()
+{
+	if (Count > 1)
+	{
+		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 */
+			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(), mesg.c_str());
+				}
+
+				i++;
+			}
+		}
+
+	}
+	LastMessage = "";
+	LastBlocked = false;
+	Count = 0;
+}