X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=6ec05602ddbaaacdacff1cf96b7b5910e5dd14dd;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=41e42ebb6976ce81bea31985573d4f1008c33be7;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 41e42ebb6..6ec05602d 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -27,14 +27,14 @@ class CommandKnock : public Command
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		Channel* c = ServerInstance->FindChan(parameters[0]);
 		std::string line;
 
 		if (!c)
 		{
-			user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
+			user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
@@ -56,11 +56,11 @@ class CommandKnock : public Command
 			return CMD_FAILURE;
 		}
 
-		for (int i = 1; i < pcnt - 1; i++)
+		for (int i = 1; i < (int)parameters.size() - 1; i++)
 		{
-			line = line + std::string(parameters[i]) + " ";
+			line = line + parameters[i] + " ";
 		}
-		line = line + std::string(parameters[pcnt-1]);
+		line = line + parameters[parameters.size()-1];
 
 		c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str());
 		user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick,c->name);
@@ -70,32 +70,10 @@ class CommandKnock : public Command
 
 /** Handles channel mode +K
  */
-class Knock : public ModeHandler
+class Knock : public SimpleChannelModeHandler
 {
  public:
-	Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('K'))
-			{
-				channel->SetMode('K',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('K'))
-			{
-				channel->SetMode('K',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { }
 };
 
 class ModuleKnock : public Module
@@ -124,7 +102,7 @@ class ModuleKnock : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };