Debug to try figure this out ..

[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 e3370fa5653c64adfebaadc41bd5c41aaf228f20..c9c9e312ef309f0b52beb62cab292df33db3354e 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-2007 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"
@@ -15,12 +28,31 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest
                return MODEACTION_DENY;
 
        /* Set the bitfields */
-       if (dest->modes[UM_SERVERNOTICE] != adding)
+       if (adding)
        {
-               dest->modes[UM_SERVERNOTICE] = 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);
+               }
                return MODEACTION_ALLOW;
        }
+       else
+       {
+               if (dest->modes[UM_SNOMASK] != false)
+               {
+                       dest->modes[UM_SNOMASK] = false;
+                       return MODEACTION_ALLOW;
+               }
+       }
 
        /* Allow the change */
        return MODEACTION_DENY;
 }
+