X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fumode_n.cpp;h=878de80970ebc4b9fdaa4eec5fbe79b1e7421390;hb=5db3290d939509015167b7fdfba5073285051560;hp=c9c9e312ef309f0b52beb62cab292df33db3354e;hpb=6d2fc8eac05b76126f78e063778bfc800ffa88e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index c9c9e312e..878de8097 100644
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,30 +17,25 @@
 #include "users.h"
 #include "modes/umode_n.h"
 
-ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 'n', 1, 0, false, MODETYPE_USER, true)
+ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 's', 1, 0, false, MODETYPE_USER, true)
 {
 }
 
-ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding, bool servermode)
 {
 	/* Only opers can change other users modes */
-	if ((source != dest) && (!*source->oper))
+	if ((source != dest) && (!IS_OPER(source)))
 		return MODEACTION_DENY;
 
-	/* Set the bitfields */
+	/* Set the array fields */
 	if (adding)
 	{
 		/* Fix for bug #310 reported by Smartys */
 		if (!dest->modes[UM_SNOMASK])
-			memset(dest->snomasks, 0, sizeof(dest->snomasks));
+			dest->snomasks.reset();
 
 		parameter = dest->ProcessNoticeMasks(parameter.c_str());
 		dest->modes[UM_SNOMASK] = true;
-		if (!dest->modes[UM_SERVERNOTICE])
-		{
-			const char* newmodes[] = { dest->nick, "+s" };
-			ServerInstance->Modes->Process(newmodes, 2, source, true);
-		}
 		return MODEACTION_ALLOW;
 	}
 	else