+/* +------------------------------------+
+ * | 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"
{
}
-ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string ¶meter, bool adding)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))
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);
+ }
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 */