cmode_b: Correction to the maxbans conditional

[user/henk/code/inspircd.git] / src / modes / umode_s.cpp

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index f0441b85f7efe4035286ec6de6681b9a92acfeeb..1b782ae853dbd74444c61e5a087a71b2823c5b63 100644 (file)
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -1 +1,72 @@
-/*       +------------------------------------+\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_s.h"\r\rModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Instance, 's', 0, 0, false, MODETYPE_USER, false)\r{\r}\r\rModeAction ModeUserServerNotice::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 (dest->modes[UM_SERVERNOTICE] != adding)\r    {\r              dest->modes[UM_SERVERNOTICE] = adding;\r         this->count += (adding ? 1: -1);\r               return MODEACTION_ALLOW;\r       }\r\r     /* Allow the change */\r return MODEACTION_DENY;\r}\r\runsigned int ModeUserServerNotice::GetCount()\r{\r     return count;\r}\r
\ No newline at end of file
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+#include "mode.h"
+#include "channels.h"
+#include "users.h"
+#include "modes/umode_s.h"
+
+ModeUserServerNoticeMask::ModeUserServerNoticeMask() : ModeHandler(NULL, "snomask", 's', PARAM_SETONLY, MODETYPE_USER)
+{
+       oper = true;
+}
+
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding)
+{
+       /* Set the array fields */
+       if (adding)
+       {
+               /* Fix for bug #310 reported by Smartys */
+               if (!dest->modes[UM_SNOMASK])
+                       dest->snomasks.reset();
+
+               dest->modes[UM_SNOMASK] = true;
+               parameter = dest->ProcessNoticeMasks(parameter.c_str());
+               return MODEACTION_ALLOW;
+       }
+       else
+       {
+               if (dest->modes[UM_SNOMASK] != false)
+               {
+                       dest->modes[UM_SNOMASK] = false;
+                       return MODEACTION_ALLOW;
+               }
+       }
+
+       /* Allow the change */
+       return MODEACTION_DENY;
+}
+
+std::string ModeUserServerNoticeMask::GetUserParameter(User* user)
+{
+       std::string masks = user->FormatNoticeMasks();
+       if (masks.length())
+               masks = "+" + masks;
+       return masks;
+}
+
+void ModeUserServerNoticeMask::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+       user->WriteServ("NOTICE %s :*** The user mode +s requires a parameter (server notice mask). Please provide a parameter, e.g. '+s +*'.",
+                       user->nick.c_str());
+}
+