X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_k.cpp;h=c785f6705c682d5730df95a171922ab90d43756e;hb=86775e2e98f55b3b88befe2daff0ca23f02f3155;hp=6e5ba0269f9723fc1c2e5f384898da2da27a7bf3;hpb=e84bf9f3ec5a60078c32b272d3d7885c0708c544;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 6e5ba0269..c785f6705 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,61 +1,103 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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/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)
 {
 }
 
-ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-{       
-        if (channel->modes[CM_KEY])
-        {
-                return std::make_pair(true, channel->key);
-        }
-        else
-        {
-                return std::make_pair(false, parameter);
-        }
-}       
-
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	/* When TS is equal, the alphabetically later channel key wins */
-	return (their_param < our_param);
+    if (channel->modes[CM_KEY])
+    {
+		std::string ckey = channel->GetModeParameter('k');
+		return std::make_pair(true, ckey);
+    }
+    else
+    {
+		return std::make_pair(false, parameter);
+    }
 }
 
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-	if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
+	/** +k needs a parameter when being removed,
+	 * so we have a special-case RemoveMode here for it
+	 */
+
+	if (channel->IsModeSet('k'))
 	{
-		if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
+		if (stack)
 		{
-			/* Key is currently set and the correct key wasnt given */
-			ServerInstance->Log(DEBUG,"Key Cond 2");
-			return MODEACTION_DENY;
+			stack->Push('k', channel->GetModeParameter('k'));
 		}
-		else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
+		else
 		{
-			/* Key isnt currently set */
-			strlcpy(channel->key,parameter.c_str(),32);
-			channel->modes[CM_KEY] = adding;
-			return MODEACTION_ALLOW;
+			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);
 		}
-		else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
+	}
+}
+
+void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
+{
+}
+
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+{
+	bool exists = channel->IsModeSet('k');
+	if (IS_LOCAL(source))
+	{
+		if (exists == adding)
+			return MODEACTION_DENY;
+		if (exists && (parameter != channel->GetModeParameter('k')))
 		{
-			/* Key is currently set, and correct key was given */
-			*channel->key = 0;
-			channel->modes[CM_KEY] = adding;
-			return MODEACTION_ALLOW;
+			/* Key is currently set and the correct key wasnt given */
+			return MODEACTION_DENY;
+		}
+	} else {
+		if (exists && adding && parameter == channel->GetModeParameter('k'))
+		{
+			/* no-op, don't show */
+			return MODEACTION_DENY;
 		}
-		ServerInstance->Log(DEBUG,"Key Cond three");
+	}
+
+	/* 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
 	{
-		ServerInstance->Log(DEBUG,"Key Condition one");
-		return MODEACTION_DENY;
+		channel->SetModeParam('k', "");
 	}
+	return MODEACTION_ALLOW;
 }