X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_knock.cpp;h=28b3b1c50d27702824b48eb85115f16bb685737f;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=8f040cd3873951c7c7570caea50aa55cd8bb6e84;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 8f040cd38..28b3b1c50 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,165 +2,107 @@
  *       | 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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 "inspircd.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-static Server *Srv;
-
-class cmd_knock : public command_t
+/** Handles the /KNOCK command
+ */
+class CommandKnock : public Command
 {
  public:
-	cmd_knock () : command_t("KNOCK", 0, 2)
+	CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 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 std::vector<std::string> &parameters, User *user)
 	{
-		chanrec* c = Srv->FindChannel(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.c_str(), 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);
-			return;
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name.c_str());
+			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_str(), c->name.c_str());
+			return CMD_FAILURE;
 		}
-		line = line + std::string(parameters[pcnt-1]);
 
-		if (c->modes[CM_INVITEONLY])
+		if (!c->modes[CM_INVITEONLY])
 		{
-			c->WriteChannelWithServ((char*)Srv->GetServerName().c_str(),  "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;
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name.c_str());
+			return CMD_FAILURE;
 		}
-		else
+
+		for (int i = 1; i < (int)parameters.size() - 1; i++)
 		{
-			user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
-			return;
+			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.c_str(), user->nick.c_str(), c->name.c_str(), line.c_str());
+		user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
 	}
 };
 
-class Knock : public ModeHandler
+/** Handles channel mode +K
+ */
+class Knock : public SimpleChannelModeHandler
 {
  public:
-	Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* 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(Module* Creator) : SimpleChannelModeHandler(Creator, 'K') { }
 };
 
 class ModuleKnock : public Module
 {
-	cmd_knock* mycommand;
-	Knock* kn;
+	CommandKnock cmd;
+	Knock kn;
  public:
-	ModuleKnock(Server* Me) : Module::Module(Me)
+	ModuleKnock() : cmd(this), kn(this)
 	{
-		Srv = Me;
-		kn = new Knock();
-		Srv->AddMode(kn, 'K');
-		mycommand = new cmd_knock();
-		Srv->AddCommand(mycommand);
-	}
+		if (!ServerInstance->Modes->AddMode(&kn))
+			throw ModuleException("Could not add new modes!");
+		ServerInstance->AddCommand(&cmd);
 
-	void Implements(char* List)
-	{
-		List[I_On005Numeric] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output,"K",4);
-	}
 
 	virtual ~ModuleKnock()
 	{
-		DELETE(kn);
+		ServerInstance->Modes->DelMode(&kn);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
-	}
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleKnockFactory : public ModuleFactory
-{
- public:
-	ModuleKnockFactory()
-	{
-	}
-	
-	~ModuleKnockFactory()
-	{
+		return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleKnock(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)