X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=a2fd985aa01def81367e6ae50b29b4472605bacf;hb=83137d5f9274832f152acc7d19de3cb0897f9630;hp=c0056c29fa6134e58655a50c3e9822306e364639;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index c0056c29f..a2fd985aa 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,9 +27,10 @@ class CommandKnock : public Command
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
 		Channel* c = ServerInstance->FindChan(parameters[0]);
+		std::string line;
 
 		if (!c)
 		{
@@ -37,7 +38,11 @@ class CommandKnock : public Command
 			return CMD_FAILURE;
 		}
 
-		std::string line;
+		if (c->HasUser(user))
+		{
+			user->WriteServ("480 %s :Can't KNOCK on %s, you are already on that channel.", user->nick, c->name);
+			return CMD_FAILURE;
+		}
 
 		if (c->IsModeSet('K'))
 		{
@@ -45,18 +50,18 @@ class CommandKnock : public Command
 			return CMD_FAILURE;
 		}
 
-		for (int i = 1; i < pcnt - 1; i++)
-		{
-			line = line + std::string(parameters[i]) + " ";
-		}
-		line = line + std::string(parameters[pcnt-1]);
-
 		if (!c->modes[CM_INVITEONLY])
 		{
 			user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
 			return CMD_FAILURE;
 		}
 
+		for (int i = 1; i < pcnt - 1; i++)
+		{
+			line = line + std::string(parameters[i]) + " ";
+		}
+		line = line + std::string(parameters[pcnt-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);
 		return CMD_SUCCESS;
@@ -70,7 +75,7 @@ class Knock : public ModeHandler
  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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -102,7 +107,7 @@ class ModuleKnock : public Module
 	{
 		kn = new Knock(ServerInstance);
 
-		if (!ServerInstance->AddMode(kn))
+		if (!ServerInstance->Modes->AddMode(kn))
 			throw ModuleException("Could not add new modes!");
 
 		mycommand = new CommandKnock(ServerInstance);
@@ -110,9 +115,6 @@ class ModuleKnock : public Module
 
 	}
 
-	void Implements(char* List)
-	{
-	}
 
 	virtual ~ModuleKnock()
 	{