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

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 02dfb7c2f..e4c02057f 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -24,7 +24,12 @@ SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
 }
 
 SnomaskManager::~SnomaskManager()
-{
+{	
+	for (std::map<char, Snomask *>::iterator i = SnoMasks.begin(); i != SnoMasks.end(); i++)
+	{
+		delete i->second;
+	}
+	SnoMasks.clear();
 }
 
 void SnomaskManager::FlushSnotices()
@@ -88,14 +93,14 @@ bool SnomaskManager::IsEnabled(char letter)
 void SnomaskManager::SetupDefaults()
 {
 	this->EnableSnomask('c',"CONNECT");			/* Local connect notices */
-	this->EnableSnomask('C',"REMOTECONNECT");		/* Remote 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('Q',"REMOTEQUIT");		/* Remote quit notices */
 	this->EnableSnomask('k',"KILL");			/* Kill notices */
-	this->EnableSnomask('K',"REMOTEKILL");			/* Remote 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('O',"ALLOPERS");			/* 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 */
@@ -122,18 +127,21 @@ void Snomask::Flush()
 	if (this->LastMessage.empty())
 		return;
 
-	ServerInstance->Log(DEBUG, "Flusing snomask %s", this->Description.c_str());
+	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->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+	for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
 	{
 		User* a = *i;
-		if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(MySnomask))
+		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);
 			}
 		}
 	}