X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fumode_s.cpp;h=f0fa5e94bb784a8cd97db6da64f9dbfcd0809421;hb=b200104cf2c61465acecaca111e3ec727fc3b954;hp=3a70161d530be14591613b7f62019ddef7c1f86f;hpb=f610b723f0b45cf7e4f478f0676ed97c3a23d78c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index 3a70161d5..f0fa5e94b 100644
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -1,53 +1,144 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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"
+#include "builtinmodes.h"
 
-ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHandler(Instance, 's', 1, 0, false, MODETYPE_USER, true)
+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, bool servermode)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string &parameter, bool adding)
 {
-	/* Only opers can change other users modes */
-	if ((source != dest) && (!IS_OPER(source)))
-		return MODEACTION_DENY;
-
-	/* Set the array fields */
 	if (adding)
 	{
-		/* Fix for bug #310 reported by Smartys */
-		if (!dest->modes[UM_SNOMASK])
-			dest->snomasks.reset();
-
-		parameter = dest->ProcessNoticeMasks(parameter.c_str());
-		dest->modes[UM_SNOMASK] = true;
+		dest->SetMode(this, true);
+		// Process the parameter (remove chars we don't understand, remove redundant chars, etc.)
+		parameter = ProcessNoticeMasks(dest, parameter);
 		return MODEACTION_ALLOW;
 	}
 	else
 	{
-		if (dest->modes[UM_SNOMASK] != false)
+		if (dest->IsModeSet(this))
 		{
-			dest->modes[UM_SNOMASK] = false;
+			dest->SetMode(this, false);
+			dest->snomasks.reset();
 			return MODEACTION_ALLOW;
 		}
 	}
 
-	/* Allow the change */
+	// Mode not set and trying to unset, deny
 	return MODEACTION_DENY;
 }
 
+std::string ModeUserServerNoticeMask::GetUserParameter(User* user)
+{
+	std::string ret;
+	if (!user->IsModeSet(this))
+		return ret;
+
+	ret.push_back('+');
+	for (unsigned char n = 0; n < 64; n++)
+	{
+		if (user->snomasks[n])
+			ret.push_back(n + 'A');
+	}
+	return ret;
+}
+
+void ModeUserServerNoticeMask::OnParameterMissing(User* user, User* dest, Channel* channel)
+{
+	user->WriteNotice("*** The user mode +s requires a parameter (server notice mask). Please provide a parameter, e.g. '+s +*'.");
+}
+
+std::string ModeUserServerNoticeMask::ProcessNoticeMasks(User* user, const std::string& input)
+{
+	bool adding = true;
+	std::bitset<64> curr = user->snomasks;
+
+	for (std::string::const_iterator i = input.begin(); i != input.end(); ++i)
+	{
+		switch (*i)
+		{
+			case '+':
+				adding = true;
+			break;
+			case '-':
+				adding = false;
+			break;
+			case '*':
+				for (size_t j = 0; j < 64; j++)
+				{
+					if (ServerInstance->SNO->IsSnomaskUsable(j+'A'))
+						curr[j] = adding;
+				}
+			break;
+			default:
+				// For local users check whether the given snomask is valid and enabled - IsSnomaskUsable() tests both.
+				// For remote users accept what we were told, unless the snomask char is not a letter.
+				if (IS_LOCAL(user))
+				{
+					if (!ServerInstance->SNO->IsSnomaskUsable(*i))
+					{
+						user->WriteNumeric(ERR_UNKNOWNSNOMASK, *i, "is unknown snomask char to me");
+						continue;
+					}
+				}
+				else if (!(((*i >= 'a') && (*i <= 'z')) || ((*i >= 'A') && (*i <= 'Z'))))
+					continue;
+
+				size_t index = ((*i) - 'A');
+				curr[index] = adding;
+			break;
+		}
+	}
+
+	std::string plus = "+";
+	std::string minus = "-";
+
+	// Apply changes and construct two strings consisting of the newly added and the removed snomask chars
+	for (size_t i = 0; i < 64; i++)
+	{
+		bool isset = curr[i];
+		if (user->snomasks[i] != isset)
+		{
+			user->snomasks[i] = isset;
+			std::string& appendhere = (isset ? plus : minus);
+			appendhere.push_back(i+'A');
+		}
+	}
+
+	// Create the final string that will be shown to the user and sent to servers
+	// Form: "+ABc-de"
+	std::string output;
+	if (plus.length() > 1)
+		output = plus;
+
+	if (minus.length() > 1)
+		output += minus;
+
+	// Unset the snomask usermode itself if every snomask was unset
+	if (user->snomasks.none())
+		user->SetMode(this, false);
+
+	return output;
+}