X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=df524b51f10f6b51b8614932172770220cf50710;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=73dbe9a6c683ae3e7311145e013ee296d2a13013;hpb=71364e3d91fd4882672494016b06ee7575cbf8f9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 73dbe9a6c..df524b51f 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -2,26 +2,17 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
+#include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "commands.h"
-#include "xline.h"
 #include "snomasks.h"
 
 SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
@@ -62,10 +53,10 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
 	if (n != SnoMasks.end())
 	{
 		/* Only opers can receive snotices, so we iterate the oper list */
-		for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+		for (std::list<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());
@@ -76,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);
@@ -93,15 +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('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 */
 }