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 217e06ea11124445df3d3ee8e1f20cb1bb275445..878de80970ebc4b9fdaa4eec5fbe79b1e7421390 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,14 +17,14 @@
 #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(User* source, User* dest, 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 array fields */
@@ -32,15 +32,10 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Chan
        {
                /* Fix for bug #310 reported by Smartys */
                if (!dest->modes[UM_SNOMASK])
-                       memset(dest->snomasks, 0, sizeof(dest->snomasks));
+                       dest->snomasks.reset();
 
                parameter = dest->ProcessNoticeMasks(parameter.c_str());
                dest->modes[UM_SNOMASK] = true;
-               if (!dest->modes[UM_SERVERNOTICE])
-               {
-                       const char* newmodes[] = { dest->nick, "+s" };
-                       ServerInstance->Modes->Process(newmodes, 2, source, true);
-               }
                return MODEACTION_ALLOW;
        }
        else