Crash fixes from nenolod

[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 c5d2599d87108e5ee0976e3467547af8eb72dda5..db386a32b06f24f6f3f25fa08f81e7ec725eb8e2 100644 (file)
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -1 +1,58 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "mode.h"\r#include "channels.h"\r#include "users.h"\r#include "modes/umode_n.h"\r\rModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 'n', 1, 0, false, MODETYPE_USER, true)\r{\r}\r\rModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)\r{\r        /* Only opers can change other users modes */\r  if ((source != dest) && (!*source->oper))\r              return MODEACTION_DENY;\r\r       /* Set the bitfields */\r        if (adding)\r    {\r              /* Fix for bug #310 reported by Smartys */\r             if (!dest->modes[UM_SNOMASK])\r                  memset(dest->snomasks, 0, sizeof(dest->snomasks));\r\r            parameter = dest->ProcessNoticeMasks(parameter.c_str());\r               dest->modes[UM_SNOMASK] = true;\r                if (!dest->modes[UM_SERVERNOTICE])\r             {\r                      const char* newmodes[] = { dest->nick, "+s" };\r                 ServerInstance->Modes->Process(newmodes, 2, source, true);\r             }\r              return MODEACTION_ALLOW;\r       }\r      else\r   {\r              if (dest->modes[UM_SNOMASK] != false)\r          {\r                      dest->modes[UM_SNOMASK] = false;\r                       return MODEACTION_ALLOW;\r               }\r      }\r\r     /* Allow the change */\r return MODEACTION_DENY;\r}\r\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | 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)
+{
+}
+
+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))
+               return MODEACTION_DENY;
+
+       /* 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);
+               }
+               return MODEACTION_ALLOW;
+       }
+       else
+       {
+               if (dest->modes[UM_SNOMASK] != false)
+               {
+                       dest->modes[UM_SNOMASK] = false;
+                       return MODEACTION_ALLOW;
+               }
+       }
+
+       /* Allow the change */
+       return MODEACTION_DENY;
+}
+