Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / modes / umode_s.cpp

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index a56e29034e04052b36a7e99cf7d0e39eee58a5cc..9d4d0932929cc18afb6077cdeded724c2fb86b7c 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -1,25 +1,64 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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() : ModeHandler(NULL, 's', PARAM_SETONLY, MODETYPE_USER)
 {
+       oper = 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)
 {
-       /* Only opers can change other users modes */
-       if ((source != dest) && (!*source->oper))
+       /* Set the array fields */
+       if (adding)
+       {
+               /* Fix for bug #310 reported by Smartys */
+               if (!dest->modes[UM_SNOMASK])
+                       dest->snomasks.reset();
+
+               dest->modes[UM_SNOMASK] = true;
+               parameter = dest->ProcessNoticeMasks(parameter.c_str());
                return MODEACTION_ALLOW;
+       }
+       else
+       {
+               if (dest->modes[UM_SNOMASK] != false)
+               {
+                       dest->modes[UM_SNOMASK] = false;
+                       return MODEACTION_ALLOW;
+               }
+       }
 
-       /* Set the bitfields */
-       adding ? dest->modebits |= UM_SERVERNOTICE : dest->modebits &= ~UM_SERVERNOTICE;
+       /* Allow the change */
+       return MODEACTION_DENY;
+}
 
-       /* Use the bitfields to build the user's mode string */
-       ModeParser::BuildModeString(dest);
+std::string ModeUserServerNoticeMask::GetUserParameter(User* user)
+{
+       std::string masks = user->FormatNoticeMasks();
+       if (masks.length())
+               masks = "+" + masks;
+       return masks;
+}
 
-       /* Allow the change */
-       return MODEACTION_ALLOW;
+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());
 }
+