After discussions and thought, move umode +n to +s. This increases cross-ircd compat...

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

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index 7bb8dbbf0f2b3026d81cb8a09b4ab967e099fcf8..878de80970ebc4b9fdaa4eec5fbe79b1e7421390 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -1,29 +1,50 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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_n.h"
 
-ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 'n', 1, 0, false, MODETYPE_USER, true)
+ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 's', 1, 0, false, MODETYPE_USER, true)
 {
 }
 
-ModeAction ModeUserServerNoticeMask::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 */
+       /* Set the array fields */
        if (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)
+       else
        {
-               dest->modes[UM_SNOMASK] = false;
-               return MODEACTION_ALLOW;
+               if (dest->modes[UM_SNOMASK] != false)
+               {
+                       dest->modes[UM_SNOMASK] = false;
+                       return MODEACTION_ALLOW;
+               }
        }
 
        /* Allow the change */