Collision tweaks

[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 f2c83845466861aa144901d27039f22212690b7e..ed08b60f4e80f73d6ec63ab6ba092c3d78afb889 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | 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"
@@ -8,28 +21,37 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 {
 }
 
-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])
+                       memset(dest->snomasks, 0, sizeof(dest->snomasks));
+
                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);
+                       std::vector<std::string> newmodes;
+                       newmodes.push_back(dest->nick);
+                       newmodes.push_back("+s");
+                       ServerInstance->Modes->Process(newmodes, source, 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 */