X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=380416a9d3458167216d8deab18c95be4735e566;hb=c2a3ebea46f3527e0680f1258725f95ff13f0880;hp=889457ade88ba82e5cff1fbbff4f7c1a503bf1e0;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 889457ade..380416a9d 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include "snomasks.h"
 
-SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
+SnomaskManager::SnomaskManager()
 {
 	SnoMasks.clear();
 	this->SetupDefaults();
@@ -44,7 +44,7 @@ bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
 {
 	if (SnoMasks.find(letter) == SnoMasks.end())
 	{
-		Snomask *s = new Snomask(ServerInstance, letter, type);
+		Snomask *s = new Snomask(letter, type);
 		SnoMasks[letter] = s;
 		return true;
 	}
@@ -125,6 +125,7 @@ void SnomaskManager::SetupDefaults()
 	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('X',"REMOTEXLINE");			/* Remove Xline notice (g/z/q/k/e) */
 	this->EnableSnomask('t',"STATS");			/* Local or remote stats request */
 	this->EnableSnomask('f',"FLOOD");			/* Flooding notices */
 }
@@ -143,7 +144,7 @@ void Snomask::SendMessage(const std::string &message)
 		char mysnomask = MySnomask;
 		ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
 
-		FIRST_MOD_RESULT(ServerInstance, OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
+		FIRST_MOD_RESULT(OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
 
 		LastBlocked = (MOD_RESULT == MOD_RES_DENY);