X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_k.cpp;h=e56b26ff132b4975e8355eb38a46fef303f30e80;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=b1cfac1e9c3340718c6589da20af20783870c42d;hpb=d0b88e61788c4b0d3e3d39097ba4e87f5cdb0454;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index b1cfac1e9..e56b26ff1 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,53 +1,57 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   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/cmode_k.h"
+#include "builtinmodes.h"
 
-ModeChannelKey::ModeChannelKey() : ModeHandler('k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, "key", 'k', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
 }
 
-std::pair<bool,std::string> 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);
-        }
-}       
-
-
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-	if (channel->modes[CM_KEY] != adding)
+	bool exists = channel->IsModeSet(this);
+	if (IS_LOCAL(source))
 	{
-		if ((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key)))
+		if (exists == adding)
+			return MODEACTION_DENY;
+		if (exists && (parameter != channel->GetModeParameter(this)))
 		{
 			/* Key is currently set and the correct key wasnt given */
 			return MODEACTION_DENY;
 		}
-		else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
-		{
-			/* Key isnt currently set */
-			strlcpy(channel->key,parameter.c_str(),32);
-			channel->modes[CM_KEY] = adding;
-			return MODEACTION_ALLOW;
-		}
-		else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
+	} else {
+		if (exists && adding && parameter == channel->GetModeParameter(this))
 		{
-			/* Key is currently set, and correct key was given */
-			*channel->key = 0;
-			channel->modes[CM_KEY] = adding;
-			return MODEACTION_ALLOW;
+			/* no-op, don't show */
+			return MODEACTION_DENY;
 		}
-		return MODEACTION_DENY;
-	}
-	else
-	{
-		return MODEACTION_DENY;
 	}
+
+	if (adding)
+		parameter = parameter.substr(0, 32);
+
+	return MODEACTION_ALLOW;
 }