X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=6ec05602ddbaaacdacff1cf96b7b5910e5dd14dd;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=f4a3335e653ae4bb3be70c0c7d782ec51e922808;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index f4a3335e6..6ec05602d 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
@@ -17,46 +17,51 @@
 
 /** Handles the /KNOCK command
  */
-class cmd_knock : public Command
+class CommandKnock : public Command
 {
  public:
-	cmd_knock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
+	CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
 	{
 		this->source = "m_knock.so";
 		syntax = "<channel> <reason>";
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle (const char** 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->WriteServ("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;
 		}
 
-		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 < (int)parameters.size() - 1; i++)
+		{
+			line = line + parameters[i] + " ";
+		}
+		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);
 		return CMD_SUCCESS;
@@ -65,54 +70,30 @@ class cmd_knock : 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)
-	{
-		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
 {
-	cmd_knock* mycommand;
+	CommandKnock* mycommand;
 	Knock* kn;
  public:
 	ModuleKnock(InspIRCd* Me) : Module(Me)
 	{
 		kn = new Knock(ServerInstance);
 
-		if (!ServerInstance->AddMode(kn, 'K'))
+		if (!ServerInstance->Modes->AddMode(kn))
 			throw ModuleException("Could not add new modes!");
 
-		mycommand = new cmd_knock(ServerInstance);
+		mycommand = new CommandKnock(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
-	}
 
-	void Implements(char* List)
-	{
 	}
 
+
 	virtual ~ModuleKnock()
 	{
 		ServerInstance->Modes->DelMode(kn);
@@ -121,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);
 	}
 };