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

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 6c3824ae7..e12f95d6b 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -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 */