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 3a70161d530be14591613b7f62019ddef7c1f86f..9d4d0932929cc18afb6077cdeded724c2fb86b7c 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -17,16 +17,13 @@
 #include "users.h"
 #include "modes/umode_s.h"
 
-ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 's', 1, 0, false, MODETYPE_USER, true)
+ModeUserServerNoticeMask::ModeUserServerNoticeMask() : ModeHandler(NULL, 's', PARAM_SETONLY, MODETYPE_USER)
 {
+       oper = true;
 }
 
-ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding, bool servermode)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding)
 {
-       /* Only opers can change other users modes */
-       if ((source != dest) && (!IS_OPER(source)))
-               return MODEACTION_DENY;
-
        /* Set the array fields */
        if (adding)
        {
@@ -34,8 +31,8 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
                if (!dest->modes[UM_SNOMASK])
                        dest->snomasks.reset();
 
-               parameter = dest->ProcessNoticeMasks(parameter.c_str());
                dest->modes[UM_SNOMASK] = true;
+               parameter = dest->ProcessNoticeMasks(parameter.c_str());
                return MODEACTION_ALLOW;
        }
        else
@@ -51,3 +48,17 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
        return MODEACTION_DENY;
 }
 
+std::string ModeUserServerNoticeMask::GetUserParameter(User* user)
+{
+       std::string masks = user->FormatNoticeMasks();
+       if (masks.length())
+               masks = "+" + masks;
+       return masks;
+}
+
+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());
+}
+