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

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 8e7692efc..980b3215a 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,103 +1,74 @@
-/*       +------------------------------------+
- *       | 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) 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 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/cmode_k.h"
+#include "builtinmodes.h"
 
-ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey()
+	: ParamMode<ModeChannelKey, LocalStringExt>(NULL, "key", 'k', PARAM_ALWAYS)
 {
 }
 
-ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-{       
-    if (channel->modes[CM_KEY])
-    {
-		std::string ckey = channel->GetModeParameter('k');
-		return std::make_pair(true, ckey);
-    }
-    else
-    {
-		return std::make_pair(false, parameter);
-    }
-}
-
-void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-	/** +k needs a parameter when being removed,
-	 * so we have a special-case RemoveMode here for it
-	 */
-
-	if (channel->IsModeSet(this->GetModeChar()))
+	const std::string* key = ext.get(channel);
+	bool exists = (key != NULL);
+	if (IS_LOCAL(source))
 	{
-		if (stack)
+		if (exists == adding)
+			return MODEACTION_DENY;
+		if (exists && (parameter != *key))
 		{
-			stack->Push(this->GetModeChar(), channel->GetModeParameter('k'));
+			/* Key is currently set and the correct key wasnt given */
+			return MODEACTION_DENY;
 		}
-		else
+	} else {
+		if (exists && adding && parameter == *key)
 		{
-			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);
+			/* no-op, don't show */
+			return MODEACTION_DENY;
 		}
 	}
-}
 
-void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
-{
+	channel->SetMode(this, adding);
+	if (adding)
+	{
+		if (parameter.length() > maxkeylen)
+			parameter.erase(maxkeylen);
+		ext.set(channel, parameter);
+	}
+	else
+		ext.unset(channel);
+
+	return MODEACTION_ALLOW;
 }
 
-bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
+void ModeChannelKey::SerializeParam(Channel* chan, const std::string* key, std::string& out)
 {
-	/* When TS is equal, the alphabetically later channel key wins */
-	return (their_param < our_param);
+	out += *key;
 }
 
-ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
+ModeAction ModeChannelKey::OnSet(User* source, Channel* chan, std::string& param)
 {
-	if ((channel->IsModeSet('k') != adding) || (!IS_LOCAL(source)))
-	{
-		if (((channel->IsModeSet('k')) && (parameter != channel->GetModeParameter('k'))) && (IS_LOCAL(source)))
-		{
-			/* Key is currently set and the correct key wasnt given */
-			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->SetMode('k', ckey.c_str());
-				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;
-		}
-		return MODEACTION_DENY;
-	}
-	else
-	{
-		return MODEACTION_DENY;
-	}
+	// Dummy function, never called
+	return MODEACTION_DENY;
 }
-