X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=889457ade88ba82e5cff1fbbff4f7c1a503bf1e0;hb=c11ec1cd3867fc6759fadb8143df676406b3e3e7;hp=8415dad348d55fe60caa2522e8ee8cca4257c941;hpb=606aa8f09b64d9b779fe847f7f969b6c456f8343;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 8415dad34..889457ade 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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 */
@@ -119,13 +139,13 @@ void Snomask::SendMessage(const std::string &message)
 		LastMessage = message;
 
 		std::string desc = this->Description;
-		int MOD_RESULT = 0;
+		ModResult MOD_RESULT;
 		char mysnomask = MySnomask;
 		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
 
-		FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, message));
+		FIRST_MOD_RESULT(ServerInstance, OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
 
-		LastBlocked = (MOD_RESULT == 1); // 1 blocks the message
+		LastBlocked = (MOD_RESULT == MOD_RES_DENY);
 
 		if (!LastBlocked)
 		{
@@ -151,7 +171,14 @@ void Snomask::Flush()
 {
 	if (Count > 1)
 	{
-		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: (last message repeated %u times)", this->Description.c_str(), Count);
+		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 */
@@ -160,9 +187,9 @@ void Snomask::Flush()
 			while (i != ServerInstance->Users->all_opers.end())
 			{
 				User* a = *i;
-				if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsNoticeMaskSet(MySnomask) && !a->quitting)
+				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++;