X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=e4c02057f5ad890331e4a3d3eb67b02a42780bde;hb=33d11457b46d8757142b3ab4bcac890619183c98;hp=2ab473b4506594424e0ed551f650daa6acc1c69f;hpb=28a1967177d055fbbd30b18864209721b8075ce1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 2ab473b45..e4c02057f 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -40,23 +40,11 @@ void SnomaskManager::FlushSnotices()
 	}
 }
 
-bool SnomaskManager::SetLocalOnly(char letter, bool local)
-{
-	SnoList::iterator n = SnoMasks.find(letter);
-	if (n != SnoMasks.end())
-	{
-		n->second->LocalOnly = local;
-		return n->second->LocalOnly;
-	}
-
-	throw "snomask not found wtf";
-}
-
-bool SnomaskManager::EnableSnomask(char letter, const std::string &type, bool local)
+bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
 {
 	if (SnoMasks.find(letter) == SnoMasks.end())
 	{
-		Snomask *s = new Snomask(ServerInstance, letter, type, local);
+		Snomask *s = new Snomask(ServerInstance, letter, type);
 		SnoMasks[letter] = s;
 		return true;
 	}
@@ -104,15 +92,15 @@ bool SnomaskManager::IsEnabled(char letter)
 
 void SnomaskManager::SetupDefaults()
 {
-	this->EnableSnomask('c',"CONNECT", true);			/* Local connect notices */
-	this->EnableSnomask('C',"REMOTECONNECT");		/* Remote connect notices */
-	this->EnableSnomask('q',"QUIT", true);			/* Local quit notices */
-	this->EnableSnomask('Q',"REMOTEQUIT");			/* Remote quit notices */
-	this->EnableSnomask('k',"KILL", true);			/* Kill notices */
-	this->EnableSnomask('K',"REMOTEKILL");			/* Remote kill notices */
+	this->EnableSnomask('c',"CONNECT");			/* Local connect notices */
+	this->EnableSnomask('C',"REMOTECONNECT");	/* Remote connect notices */
+	this->EnableSnomask('q',"QUIT");			/* Local quit notices */
+	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('o',"OPER");			/* 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('d',"DEBUG");			/* Debug notices */
 	this->EnableSnomask('x',"XLINE");			/* Xline notice (g/z/q/k/e) */
 	this->EnableSnomask('t',"STATS");			/* Local or remote stats request */
@@ -139,6 +127,10 @@ 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);
+
 	/* Only opers can receive snotices, so we iterate the oper list */
 	for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
 	{
@@ -146,25 +138,14 @@ void Snomask::Flush()
 		if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask) && !a->quitting)
 		{
 
-			a->WriteServ("NOTICE %s :*** %s: %s", a->nick, this->Description.c_str(), this->LastMessage.c_str());
+			a->WriteServ("NOTICE %s :*** %s: %s", a->nick.c_str(), this->Description.c_str(), this->LastMessage.c_str());
 			if (Count > 1)
 			{
-				a->WriteServ("NOTICE %s :*** %s: (last message repeated %u times)", a->nick, this->Description.c_str(), Count);
+				a->WriteServ("NOTICE %s :*** %s: (last message repeated %u times)", a->nick.c_str(), this->Description.c_str(), Count);
 			}
 		}
 	}
 
-	if (!LocalOnly)
-	{
-		// XXX this is a bit ugly.
-		std::string sno;
-		sno[0] = MySnomask;
-
-		ServerInstance->PI->SendSNONotice(sno, this->Description + ": " + this->LastMessage);
-		if (Count > 1)
-			ServerInstance->PI->SendSNONotice(sno, this->Description + ": (last message repeated " + ConvToStr(Count) + " times)");
-	}
-
 	LastMessage = "";
 	Count = 1;
 }