X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=12dc1c79694b8c876eb5ad22ee4dd038cf544ce4;hb=31f1e7ad092f8bf16ee653cc105eea4a769650ca;hp=3940a61a6e50b5e4156e27d99aaf720cb5d576d7;hpb=211b24ba8cf6e21f435f145b0366adc8a3b62460;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 3940a61a6..12dc1c796 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,139 +2,108 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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.
  *
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-Server *Srv;
-	 
-void handle_knock(char **parameters, int pcnt, userrec *user)
+/** Handles the /KNOCK command
+ */
+class CommandKnock : public Command
 {
-	chanrec* c = Srv->FindChannel(parameters[0]);
-	std::string line = "";
-
-	for (int i = 1; i < pcnt - 1; i++)
-	{
-		line = line + std::string(parameters[i]) + " ";
-	}
-	line = line + std::string(parameters[pcnt-1]);
-
-	if (c->IsCustomModeSet('K'))
-	{
-		WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-		return;
-	}
-	if (c->inviteonly)
+ public:
+	CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
 	{
-		WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,user,"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;
+		this->source = "m_knock.so";
+		syntax = "<channel> <reason>";
+		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
-	else
+	
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		WriteServ(user->fd,"480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
-		return;
-	}
-}
+		Channel* c = ServerInstance->FindChan(parameters[0]);
+		std::string line;
 
+		if (!c)
+		{
+			user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
+		}
 
-class ModuleKnock : public Module
-{
- public:
-	ModuleKnock()
-	{
-		Srv = new Server;
-		
-		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
-		Srv->AddCommand("KNOCK",handle_knock,0,2,"m_knock.so");
-	}
+		if (c->HasUser(user))
+		{
+			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;
+		}
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "K";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
+		if (c->IsModeSet('K'))
 		{
-	                output = temp2.substr(0,temp2.length()-1) + std::string(" KNOCK");
+			user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name.c_str());
+			return CMD_FAILURE;
 		}
-		else output = output + std::string(" KNOCK");
-        }
 
-	virtual ~ModuleKnock()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1);
-	}
-	
-	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;
+		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;
 		}
-		else
+
+		for (int i = 1; i < (int)parameters.size() - 1; i++)
 		{
-			return 0;
+			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;
+	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+/** Handles channel mode +K
+ */
+class Knock : public SimpleChannelModeHandler
+{
+ public:
+	Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { }
+};
 
-class ModuleKnockFactory : public ModuleFactory
+class ModuleKnock : public Module
 {
+	CommandKnock* mycommand;
+	Knock* kn;
  public:
-	ModuleKnockFactory()
+	ModuleKnock(InspIRCd* Me) : Module(Me)
 	{
+		kn = new Knock(ServerInstance);
+
+		if (!ServerInstance->Modes->AddMode(kn))
+			throw ModuleException("Could not add new modes!");
+
+		mycommand = new CommandKnock(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+
 	}
-	
-	~ModuleKnockFactory()
+
+
+	virtual ~ModuleKnock()
 	{
+		ServerInstance->Modes->DelMode(kn);
+		delete kn;
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleKnock;
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)