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

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index 4b3179001..dde0cb15d 100644
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.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,29 +17,43 @@
 #include "users.h"
 #include "modes/umode_s.h"
 
-ModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Instance, '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))
+	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;
-		this->count += (adding ? 1: -1);
+		/* Fix for bug #310 reported by Smartys */
+		if (!dest->modes[UM_SNOMASK])
+			dest->snomasks.reset();
+
+		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_DENY;
 }
 
-unsigned int ModeUserServerNotice::GetCount()
+void ModeUserServerNoticeMask::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
-	return count;
+	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());
 }
+