Fix <disabled:umodes> interfering with /unloadmodule m_implementing_a_umode, aquanigh...

[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..93bc60cac43d30766d36f236f0ede26bd013eb78 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -23,10 +23,6 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 
 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) && (!IS_OPER(source)))
-               return MODEACTION_DENY;
-
        /* Set the array fields */
        if (adding)
        {
@@ -51,3 +47,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());
+}
+