X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=e447cd637f1059d7e7ac7e55b09d117105ec8858;hb=2e28b264afa667923b6c17d88ffcb12315309936;hp=5ddfb3e1e493ba48523fcf2c26834fdfb46ba7a2;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 5ddfb3e1e..e447cd637 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -11,9 +11,8 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
 #include "snomasks.h"
 
 SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
@@ -57,7 +56,7 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
 		for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
 		{
 			userrec* a = *i;
-			if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE] && a->modes[UM_SNOMASK] && a->IsNoticeMaskSet(n->first))
+			if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(n->first))
 			{
 				/* send server notices to all with +ns */
 				a->WriteServ("NOTICE %s :*** %s: %s",a->nick, n->second.c_str(), text.c_str());
@@ -68,7 +67,7 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
 
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
 {
-        char textbuffer[MAXBUF];
+	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
 	va_start(argsPtr, text);
@@ -85,16 +84,17 @@ bool SnomaskManager::IsEnabled(char letter)
 
 void SnomaskManager::SetupDefaults()
 {
-	this->EnableSnomask('c',"CONNECT");		/* Local connect 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',"QUIT");			/* Local quit notices */
 	this->EnableSnomask('Q',"REMOTEQUIT");		/* Remote quit notices */
-	this->EnableSnomask('k',"KILL");		/* Kill notices */
-	this->EnableSnomask('l',"LINK");		/* Link notices */
-	this->EnableSnomask('o',"OPER");		/* Oper up/down notices */
-	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 */
-	this->EnableSnomask('f',"FLOOD");		/* Flooding 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('d',"DEBUG");			/* Debug notices */
+	this->EnableSnomask('x',"XLINE");			/* Xline notice (g/z/q/k/e) */
+	this->EnableSnomask('t',"STATS");			/* Local or remote stats request */
+	this->EnableSnomask('f',"FLOOD");			/* Flooding notices */
 }