X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=cc6fba480e7fb2f378208fd1c60b090cf8066439;hb=73b5d276db1903256c7432e333b4db8d01d58d05;hp=9169cfd4cb0a93391b55f94651ec37da166fd0b0;hpb=ced58c3be3f1da8dcf70c3904e5fe4bdaabf0e3d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 9169cfd4c..cc6fba480 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,140 +2,108 @@
  *       | 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 "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 (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
 	{
 		this->source = "m_knock.so";
+		syntax = "<channel> <reason>";
+		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
-	
-	void Handle (char **parameters, int pcnt, userrec *user)
+
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		chanrec* c = Srv->FindChannel(parameters[0]);
-		std::string line = "";
+		Channel* c = ServerInstance->FindChan(parameters[0]);
+		std::string line;
 
-		if (c->IsModeSet('K'))
+		if (!c)
 		{
-			WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-			return;
+			user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
 		}
 
-		for (int i = 1; i < pcnt - 1; i++)
+		if (c->HasUser(user))
 		{
-			line = line + std::string(parameters[i]) + " ";
+			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;
 		}
-		line = line + std::string(parameters[pcnt-1]);
 
-		if (c->modes[CM_INVITEONLY])
+		if (c->IsModeSet('K'))
 		{
-			WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,"NOTICE %s :User %s is KNOCKing on %s (%s)",c->name,user->nick,c->name,line.c_str());
-			WriteServ(user->fd,"NOTICE %s :KNOCKing on %s",user->nick,c->name);
-			return;
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name.c_str());
+			return CMD_FAILURE;
 		}
-		else
+
+		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_str(), c->name.c_str());
+			return CMD_FAILURE;
+		}
+
+		for (int i = 1; i < (int)parameters.size() - 1; i++)
 		{
-			WriteServ(user->fd,"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;
 	}
 };
 
+/** Handles channel mode +K
+ */
+class Knock : public SimpleChannelModeHandler
+{
+ public:
+	Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { }
+};
+
 class ModuleKnock : public Module
 {
-	cmd_knock* mycommand;
+	CommandKnock* mycommand;
+	Knock* kn;
  public:
-	ModuleKnock(Server* Me)
-		: Module::Module(Me)
+	ModuleKnock(InspIRCd* Me) : Module(Me)
 	{
-		Srv = Me;
-		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
-		mycommand = new cmd_knock();
-		Srv->AddCommand(mycommand);
-	}
+		kn = new Knock(ServerInstance);
 
-	void Implements(char* List)
-	{
-		List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
-	}
+		if (!ServerInstance->Modes->AddMode(kn))
+			throw ModuleException("Could not add new modes!");
 
-        virtual void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"K",4);
-        }
+		mycommand = new CommandKnock(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 
-	virtual ~ModuleKnock()
-	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		// check if this is our mode character...
-		if ((modechar == 'K') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleKnockFactory : public ModuleFactory
-{
- public:
-	ModuleKnockFactory()
-	{
-	}
-	
-	~ModuleKnockFactory()
+	virtual ~ModuleKnock()
 	{
+		ServerInstance->Modes->DelMode(kn);
+		delete kn;
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleKnock(Me);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)