Use the error name constants here now rather than magic numbers. magic numbers blow...

[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 94068065f94680f8d86aea24c6abf6af98935f70..dde0cb15d530e6cb8e47149585462a407da946c0 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -17,28 +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(User* source, User* dest, Channel*, std::string&, 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;
+               /* 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());
 }
+