X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=e0305ea061330120fe1a575a5e0059b6eb93e1ea;hb=a500ec70bb82151c8fcf7443b4645640233952e8;hp=4b9c9d86b29194162eff736b61bee1da848af5c9;hpb=2d2e0469b8ac7c64c9dc22f7074db8fc245e2f13;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 4b9c9d86b..e0305ea06 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -47,31 +47,21 @@ void SnomaskManager::WriteGlobalSno(char letter, const std::string& text)
 {
 	WriteToSnoMask(letter, text);
 	letter = toupper(letter);
-	ServerInstance->PI->SendSNONotice(std::string(1, letter), text);
+	ServerInstance->PI->SendSNONotice(letter, text);
 }
 
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteToSnoMask(letter, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteToSnoMask(letter, 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));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, text, text);
+	this->WriteGlobalSno(letter, textbuffer);
 }
 
 SnomaskManager::SnomaskManager()
@@ -79,54 +69,42 @@ SnomaskManager::SnomaskManager()
 	EnableSnomask('c',"CONNECT");			/* Local connect notices */
 	EnableSnomask('q',"QUIT");			/* Local quit notices */
 	EnableSnomask('k',"KILL");			/* Kill notices */
-	EnableSnomask('l',"LINK");			/* Linking notices */
 	EnableSnomask('o',"OPER");			/* Oper up/down notices */
 	EnableSnomask('a',"ANNOUNCEMENT");	/* formerly WriteOpers() - generic notices to all opers */
 	EnableSnomask('d',"DEBUG");			/* Debug notices */
 	EnableSnomask('x',"XLINE");			/* Xline notice (g/z/q/k/e) */
 	EnableSnomask('t',"STATS");			/* Local or remote stats request */
-	EnableSnomask('f',"FLOOD");			/* Flooding notices */
 }
 
-/*************************************************************************************/
+bool SnomaskManager::IsSnomaskUsable(char ch) const
+{
+	return ((isalpha(ch)) && (!masks[tolower(ch) - 'a'].Description.empty()));
+}
 
-void Snomask::SendMessage(const std::string &message, char mysnomask)
+Snomask::Snomask()
+	: Count(0)
 {
-	if (ServerInstance->Config->NoSnoticeStack || message != LastMessage || mysnomask != LastLetter)
+}
+
+void Snomask::SendMessage(const std::string& message, char letter)
+{
+	if ((!ServerInstance->Config->NoSnoticeStack) && (message == LastMessage) && (letter == LastLetter))
 	{
-		this->Flush();
-		LastMessage = message;
-		LastLetter = mysnomask;
-
-		std::string desc = Description;
-		if (desc.empty())
-			desc = std::string("SNO-") + (char)tolower(mysnomask);
-		if (isupper(mysnomask))
-			desc = "REMOTE" + desc;
-		ModResult MOD_RESULT;
-		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++;
+		return;
 	}
+
+	this->Flush();
+
+	std::string desc = GetDescription(letter);
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (letter, desc, message));
+	if (MOD_RESULT == MOD_RES_DENY)
+		return;
+
+	Snomask::Send(letter, desc, message);
+	LastMessage = message;
+	LastLetter = letter;
 	Count++;
 }
 
@@ -134,36 +112,44 @@ void Snomask::Flush()
 {
 	if (Count > 1)
 	{
-		std::string desc = Description;
-		if (desc.empty())
-			desc = std::string("SNO-") + (char)tolower(LastLetter);
-		if (isupper(LastLetter))
-			desc = "REMOTE" + desc;
-		std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)";
-
-		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), mesg.c_str());
-
-		FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(LastLetter, 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(LastLetter) && !a->quitting)
-				{
-					a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), desc.c_str(), mesg.c_str());
-				}
-
-				i++;
-			}
-		}
+		std::string desc = GetDescription(LastLetter);
+		std::string msg = "(last message repeated " + ConvToStr(Count) + " times)";
 
+		FOREACH_MOD(OnSendSnotice, (LastLetter, desc, msg));
+		Snomask::Send(LastLetter, desc, msg);
 	}
+
 	LastMessage.clear();
-	LastBlocked = false;
 	Count = 0;
 }
+
+void Snomask::Send(char letter, const std::string& desc, const std::string& msg)
+{
+	std::string log = desc;
+	log.append(": ").append(msg);
+	ServerInstance->Logs->Log("snomask", LOG_DEFAULT, log);
+
+	std::string finalmsg = "*** ";
+	finalmsg.append(log);
+	/* Only opers can receive snotices, so we iterate the oper list */
+	const std::list<User*>& opers = ServerInstance->Users->all_opers;
+	for (std::list<User*>::const_iterator i = opers.begin(); i != opers.end(); ++i)
+	{
+		User* user = *i;
+		// IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it seperately
+		if (IS_LOCAL(user) && user->IsNoticeMaskSet(letter))
+			user->WriteNotice(finalmsg);
+	}
+}
+
+std::string Snomask::GetDescription(char letter) const
+{
+	std::string ret;
+	if (isupper(letter))
+		ret = "REMOTE";
+	if (!Description.empty())
+		ret += Description;
+	else
+		ret += std::string("SNO-") + (char)tolower(letter);
+	return ret;
+}