X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodes%2Fumode_n.cpp;h=ed08b60f4e80f73d6ec63ab6ba092c3d78afb889;hb=4b856bda135a08e800b96c970a10b0b6a34d433a;hp=e3370fa5653c64adfebaadc41bd5c41aaf228f20;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index e3370fa56..ed08b60f4 100644
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
@@ -8,19 +21,40 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 {
 }
 
-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 */
-	if (dest->modes[UM_SERVERNOTICE] != adding)
+	/* Set the array fields */
+	if (adding)
 	{
-		dest->modes[UM_SERVERNOTICE] = adding;
+		/* Fix for bug #310 reported by Smartys */
+		if (!dest->modes[UM_SNOMASK])
+			memset(dest->snomasks, 0, sizeof(dest->snomasks));
+
+		parameter = dest->ProcessNoticeMasks(parameter.c_str());
+		dest->modes[UM_SNOMASK] = true;
+		if (!dest->modes[UM_SERVERNOTICE])
+		{
+			std::vector<std::string> newmodes;
+			newmodes.push_back(dest->nick);
+			newmodes.push_back("+s");
+			ServerInstance->Modes->Process(newmodes, source, true);
+		}
 		return MODEACTION_ALLOW;
 	}
+	else
+	{
+		if (dest->modes[UM_SNOMASK] != false)
+		{
+			dest->modes[UM_SNOMASK] = false;
+			return MODEACTION_ALLOW;
+		}
+	}
 
 	/* Allow the change */
 	return MODEACTION_DENY;
 }
+