X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=e12f95d6b4eb754b72639490cc5fd575ce7e3e80;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=84818be000d2bdaf2d544b885c6c334461a28be1;hpb=d566ed18f421d6f1f9133997ca314cf40fd3ce01;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 84818be00..e12f95d6b 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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.
@@ -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;
@@ -73,6 +73,13 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &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];
@@ -85,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());
@@ -102,7 +121,8 @@ void SnomaskManager::SetupDefaults()
 	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',"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('t',"STATS");			/* Local or remote stats request */
@@ -117,51 +137,67 @@ void Snomask::SendMessage(const std::string &message)
 	{
 		this->Flush();
 		LastMessage = message;
+
+		std::string desc = this->Description;
+		int MOD_RESULT = 0;
+		char mysnomask = MySnomask;
+		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
+
+		FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, message));
+
+		LastBlocked = (MOD_RESULT == 1); // 1 blocks the message
+
+		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++;
+			}
+		}
 	}
-	else
-	{
-		Count++;
-	}
+	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;
+	{
+		std::string desc = this->Description;
+		std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)";
+		char mysnomask = MySnomask;
 
-	FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, this->LastMessage));
+		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), mesg.c_str());
 
-	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();
+		FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, mesg));
 
-		while (i != ServerInstance->Users->all_opers.end())
+		if (!LastBlocked)
 		{
-			User* a = *i;
-			if (IS_LOCAL(a) && a->IsModeSet('s') && 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.c_str(), desc.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.c_str(), this->Description.c_str(), Count);
+					a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), mesg.c_str());
 				}
-			}
 
-			i++;
+				i++;
+			}
 		}
-	}
 
+	}
 	LastMessage = "";
-	Count = 1;
+	LastBlocked = false;
+	Count = 0;
 }