X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_k.cpp;h=980b3215a4e504fad6dc65577476a882c404686e;hb=aa05a6fd4d5c11dc8e8adc469134a2802446fe9f;hp=f07d471729547de69a895585c795552a69cf98bb;hpb=95593de52c9b89dd3dae8d79a2c76efc81d9d353;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index f07d47172..980b3215a 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -21,37 +21,54 @@
 
 
 #include "inspircd.h"
-#include "mode.h"
-#include "channels.h"
-#include "users.h"
 #include "builtinmodes.h"
 
-ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, "key", 'k', PARAM_ALWAYS, MODETYPE_CHANNEL)
+ModeChannelKey::ModeChannelKey()
+	: ParamMode<ModeChannelKey, LocalStringExt>(NULL, "key", 'k', PARAM_ALWAYS)
 {
 }
 
 ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-	bool exists = channel->IsModeSet('k');
+	const std::string* key = ext.get(channel);
+	bool exists = (key != NULL);
 	if (IS_LOCAL(source))
 	{
 		if (exists == adding)
 			return MODEACTION_DENY;
-		if (exists && (parameter != channel->GetModeParameter('k')))
+		if (exists && (parameter != *key))
 		{
 			/* Key is currently set and the correct key wasnt given */
 			return MODEACTION_DENY;
 		}
 	} else {
-		if (exists && adding && parameter == channel->GetModeParameter('k'))
+		if (exists && adding && parameter == *key)
 		{
 			/* no-op, don't show */
 			return MODEACTION_DENY;
 		}
 	}
 
+	channel->SetMode(this, adding);
 	if (adding)
-		parameter = parameter.substr(0, 32);
+	{
+		if (parameter.length() > maxkeylen)
+			parameter.erase(maxkeylen);
+		ext.set(channel, parameter);
+	}
+	else
+		ext.unset(channel);
 
 	return MODEACTION_ALLOW;
 }
+
+void ModeChannelKey::SerializeParam(Channel* chan, const std::string* key, std::string& out)
+{
+	out += *key;
+}
+
+ModeAction ModeChannelKey::OnSet(User* source, Channel* chan, std::string& param)
+{
+	// Dummy function, never called
+	return MODEACTION_DENY;
+}