X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_k.cpp;h=c785f6705c682d5730df95a171922ab90d43756e;hb=7892c8a0313c50d8138942ff3b112691caf05a2f;hp=2ee839efaf1de7fe541bdda23c003bb7697b8be3;hpb=f25f6319d5ae3eb1c48fcc84cb49c9cf08c439a5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 2ee839efa..c785f6705 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "modes/cmode_k.h"
 
-ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
 {
 }
 
@@ -40,15 +40,18 @@ void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
 	 * so we have a special-case RemoveMode here for it
 	 */
 
-	if (channel->IsModeSet(this->GetModeChar()))
+	if (channel->IsModeSet('k'))
 	{
 		if (stack)
 		{
-			stack->Push(this->GetModeChar(), channel->GetModeParameter('k'));
+			stack->Push('k', channel->GetModeParameter('k'));
 		}
 		else
 		{
-			std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->GetModeParameter('k'));
+			std::vector<std::string> parameters;
+			parameters.push_back(channel->name);
+			parameters.push_back("-k");
+			parameters.push_back(channel->GetModeParameter('k'));
 			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 		}
 	}
@@ -58,51 +61,43 @@ void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
-bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-	/* When TS is equal, the alphabetically later channel key wins */
-	return (their_param < our_param);
-}
-
-ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
-{
-	if ((channel->IsModeSet('k') != adding) || (!IS_LOCAL(source)))
+	bool exists = channel->IsModeSet('k');
+	if (IS_LOCAL(source))
 	{
-		if (((channel->IsModeSet('k')) && (parameter != channel->GetModeParameter('k'))) && (IS_LOCAL(source)))
+		if (exists == adding)
+			return MODEACTION_DENY;
+		if (exists && (parameter != channel->GetModeParameter('k')))
 		{
 			/* Key is currently set and the correct key wasnt given */
 			return MODEACTION_DENY;
 		}
-		else if (channel->IsModeSet('k') && parameter == channel->GetModeParameter('k'))
+	} else {
+		if (exists && adding && parameter == channel->GetModeParameter('k'))
 		{
-			/* Key is currently set,  setting to the same as it already is.. drop it */
+			/* no-op, don't show */
 			return MODEACTION_DENY;
 		}
-		else if ((!channel->IsModeSet('k')) || ((adding) && (!IS_LOCAL(source))))
-		{
-			/* Key isnt currently set */
-			if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
-			{
-				std::string ckey;
-				ckey.assign(parameter, 0, 32);
-				channel->SetModeParam('k', ckey.c_str(), adding);
-				channel->SetMode('k', adding);
-				parameter = ckey;
-				return MODEACTION_ALLOW;
-			}
-			else
-				return MODEACTION_DENY;
-		}
-		else if (((channel->IsModeSet('k')) && (parameter == channel->GetModeParameter('k'))) || ((!adding) && (!IS_LOCAL(source))))
-		{
-			/* Key is currently set, and correct key was given */
-			channel->SetMode('k', adding);
-			return MODEACTION_ALLOW;
-		}
+	}
+
+	/* invalid keys */
+	if (!parameter.length())
+		return MODEACTION_DENY;
+
+	if (parameter.rfind(' ') != std::string::npos)
 		return MODEACTION_DENY;
+
+	if (adding)
+	{
+		std::string ckey;
+		ckey.assign(parameter, 0, 32);
+		parameter = ckey;
+		channel->SetModeParam('k', parameter);
 	}
 	else
 	{
-		return MODEACTION_DENY;
+		channel->SetModeParam('k', "");
 	}
+	return MODEACTION_ALLOW;
 }