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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 25286f4c5..3d2f4b344 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,58 +2,58 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-
-
-class cmd_knock : public command_t
+/** Handles the /KNOCK command
+ */
+class CommandKnock : public Command
 {
  public:
- cmd_knock (InspIRCd* Instance) : command_t(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);
 	}
 	
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
-		chanrec* c = ServerInstance->FindChan(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[0]);
+		std::string line;
 
 		if (!c)
 		{
-			user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
-			return;
+			user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0]);
+			return CMD_FAILURE;
 		}
 
-		std::string line = "";
+		if (c->HasUser(user))
+		{
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick, c->name);
+			return CMD_FAILURE;
+		}
 
 		if (c->IsModeSet('K'))
 		{
-			user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-			return;
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+			return CMD_FAILURE;
+		}
+
+		if (!c->modes[CM_INVITEONLY])
+		{
+			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++)
@@ -62,26 +62,20 @@ class cmd_knock : public command_t
 		}
 		line = line + std::string(parameters[pcnt-1]);
 
-		if (c->modes[CM_INVITEONLY])
-		{
-			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;
-		}
-		else
-		{
-			user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
-			return;
-		}
+		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;
 	}
 };
 
+/** Handles channel mode +K
+ */
 class Knock : public ModeHandler
 {
  public:
 	Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -106,62 +100,32 @@ class Knock : public ModeHandler
 
 class ModuleKnock : public Module
 {
-	cmd_knock* mycommand;
+	CommandKnock* mycommand;
 	Knock* kn;
  public:
-	ModuleKnock(InspIRCd* Me) : Module::Module(Me)
+	ModuleKnock(InspIRCd* Me) : Module(Me)
 	{
-		
 		kn = new Knock(ServerInstance);
-		ServerInstance->AddMode(kn, 'K');
-		mycommand = new cmd_knock(ServerInstance);
+
+		if (!ServerInstance->Modes->AddMode(kn))
+			throw ModuleException("Could not add new modes!");
+
+		mycommand = new CommandKnock(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
-	}
 
-	void Implements(char* List)
-	{
-		List[I_On005Numeric] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->Modes->InsertMode(output,"K",4);
-	}
 
 	virtual ~ModuleKnock()
 	{
-		DELETE(kn);
+		ServerInstance->Modes->DelMode(kn);
+		delete kn;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleKnockFactory : public ModuleFactory
-{
- public:
-	ModuleKnockFactory()
-	{
-	}
-	
-	~ModuleKnockFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleKnock(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)