X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_k.cpp;h=4d4453d4497b79161dec6aeaa04dce9269eb9c62;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=2f06ba55c91514df72c9ab76c3e88edff521a9e8;hpb=f4d202cdbbcaa9e17c21e3f74d7816f58b2ffc6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 2f06ba55c..4d4453d44 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,14 +1,27 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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() : ModeHandler('k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
 {
 }
 
-std::pair<bool,std::string> ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {       
         if (channel->modes[CM_KEY])
         {
@@ -18,30 +31,63 @@ std::pair<bool,std::string> ModeChannelKey::ModeSet(userrec* source, userrec* de
         {
                 return std::make_pair(false, parameter);
         }
-}       
+}
 
+void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
+{
+	/** +k needs a parameter when being removed,
+	 * so we have a special-case RemoveMode here for it
+	 */
+
+	if (channel->IsModeSet(this->GetModeChar()))
+	{
+		if (stack)
+			stack->Push(this->GetModeChar(), channel->key);
+		else
+		{
+			std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->key);
+			ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+		}
+	}
+}
 
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
 {
-	if (channel->modes[CM_KEY] != adding)
+}
+
+bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
+{
+	/* 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)))
 	{
-		if ((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key)))
+		if (((channel->IsModeSet('k')) && (parameter != channel->key)) && (IS_LOCAL(source)))
 		{
 			/* Key is currently set and the correct key wasnt given */
 			return MODEACTION_DENY;
 		}
-		else if (!channel->modes[CM_KEY])
+		else if ((!channel->IsModeSet('k')) || ((adding) && (!IS_LOCAL(source))))
 		{
 			/* Key isnt currently set */
-			strlcpy(channel->key,parameter.c_str(),32);
-			channel->modes[CM_KEY] = adding;
-			return MODEACTION_ALLOW;
+			if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
+			{
+				channel->key.assign(parameter, 0, 32);
+				channel->SetMode('k', adding);
+				parameter = channel->key;
+				return MODEACTION_ALLOW;
+			}
+			else
+				return MODEACTION_DENY;
 		}
-		else if ((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key)))
+		else if (((channel->IsModeSet('k')) && (parameter == channel->key)) || ((!adding) && (!IS_LOCAL(source))))
 		{
 			/* Key is currently set, and correct key was given */
-			*channel->key = 0;
-			channel->modes[CM_KEY] = adding;
+			channel->key.clear();
+			channel->SetMode('k', adding);
 			return MODEACTION_ALLOW;
 		}
 		return MODEACTION_DENY;
@@ -51,3 +97,4 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
 		return MODEACTION_DENY;
 	}
 }
+