X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fumode_s.cpp;h=dde0cb15d530e6cb8e47149585462a407da946c0;hb=b708dff6d2897271321764117582a47699e72876;hp=a56e29034e04052b36a7e99cf7d0e39eee58a5cc;hpb=d40e1e5b0b8c4b94359637921387cd80e9de991b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index a56e29034..dde0cb15d 100644
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -1,25 +1,59 @@
+/*       +------------------------------------+
+ *       | 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"
 #include "users.h"
 #include "modes/umode_s.h"
 
-ModeUserServerNotice::ModeUserServerNotice() : ModeHandler('s', 0, 0, false, MODETYPE_USER, false)
+ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 's', 1, 0, false, MODETYPE_USER, true)
 {
 }
 
-ModeAction ModeUserServerNotice::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))
-		return MODEACTION_ALLOW;
+	if ((source != dest) && (!IS_OPER(source)))
+		return MODEACTION_DENY;
 
-	/* Set the bitfields */
-	adding ? dest->modebits |= UM_SERVERNOTICE : dest->modebits &= ~UM_SERVERNOTICE;
+	/* Set the array fields */
+	if (adding)
+	{
+		/* Fix for bug #310 reported by Smartys */
+		if (!dest->modes[UM_SNOMASK])
+			dest->snomasks.reset();
 
-	/* Use the bitfields to build the user's mode string */
-	ModeParser::BuildModeString(dest);
+		parameter = dest->ProcessNoticeMasks(parameter.c_str());
+		dest->modes[UM_SNOMASK] = true;
+		return MODEACTION_ALLOW;
+	}
+	else
+	{
+		if (dest->modes[UM_SNOMASK] != false)
+		{
+			dest->modes[UM_SNOMASK] = false;
+			return MODEACTION_ALLOW;
+		}
+	}
 
 	/* Allow the change */
-	return MODEACTION_ALLOW;
+	return MODEACTION_DENY;
 }
+
+void ModeUserServerNoticeMask::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+	user->WriteServ("NOTICE %s :*** The user mode +s requires a parameter (server notice mask). Please provide a parameter, e.g. '+s +*'.",
+			user->nick.c_str());
+}
+