X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=3d2f4b3444435c5152c7f98e7b222fc811a1e792;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=67aa50d49fb3248628062e16144395bdf1d1c618;hpb=7240c926c8e9aeacf95c2bd4803c8879963cca3f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 67aa50d49..3d2f4b344 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,36 +27,41 @@ 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)
 		{
-			user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+			user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
 			return CMD_FAILURE;
 		}
 
-		std::string line;
-
-		if (c->IsModeSet('K'))
+		if (c->HasUser(user))
 		{
-			user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick, c->name);
 			return CMD_FAILURE;
 		}
 
-		for (int i = 1; i < pcnt - 1; i++)
+		if (c->IsModeSet('K'))
 		{
-			line = line + std::string(parameters[i]) + " ";
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+			return CMD_FAILURE;
 		}
-		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);
+			user->WriteNumeric(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,17 +107,15 @@ 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);
 		ServerInstance->AddCommand(mycommand);
-	}
 
-	void Implements(char* List)
-	{
 	}
 
+
 	virtual ~ModuleKnock()
 	{
 		ServerInstance->Modes->DelMode(kn);
@@ -121,7 +124,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);
 	}
 };