X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=8779804c53916daff99822b6b6b6863977f1ebde;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=dc4263335ef719d9afc0baa29c2b4dc55be6083f;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index dc4263335..8779804c5 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,80 +14,127 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-Server *Srv;
-	 
-void handle_knock(char **parameters, int pcnt, userrec *user)
-{
-	chanrec* c = Srv->FindChannel(parameters[0]);
-	std::string line = "";
+static Server *Srv;
 
-	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'))
+class cmd_knock : public command_t
+{
+ public:
+	cmd_knock () : command_t("KNOCK", 0, 2)
 	{
-		WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-		return;
+		this->source = "m_knock.so";
+		syntax = "<channel> <reason>";
 	}
-	if (c->inviteonly)
+	
+	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		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;
+		chanrec* c = Srv->FindChannel(parameters[0]);
+
+		if (!c)
+		{
+			user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+			return;
+		}
+
+		std::string line = "";
+
+		if (c->IsModeSet('K'))
+		{
+			user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+			return;
+		}
+
+		for (int i = 1; i < pcnt - 1; i++)
+		{
+			line = line + std::string(parameters[i]) + " ";
+		}
+		line = line + std::string(parameters[pcnt-1]);
+
+		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;
+		}
+		else
+		{
+			user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
+			return;
+		}
 	}
-	else
+};
+
+class Knock : public ModeHandler
+{
+ public:
+	Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		WriteServ(user->fd,"480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
-		return;
-	}
-}
+		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;
+	}
+};
 
 class ModuleKnock : public Module
 {
+	cmd_knock* mycommand;
+	Knock* kn;
  public:
-	ModuleKnock()
+	ModuleKnock(Server* Me) : Module::Module(Me)
 	{
-		Srv = new Server;
-		
-		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
-		Srv->AddCommand("KNOCK",handle_knock,0,2);
+		Srv = Me;
+		kn = new Knock();
+		Srv->AddMode(kn, 'K');
+		mycommand = new cmd_knock();
+		Srv->AddCommand(mycommand);
 	}
-	
-	virtual ~ModuleKnock()
+
+	void Implements(char* List)
 	{
-		delete Srv;
+		List[I_On005Numeric] = 1;
 	}
-	
-	virtual Version GetVersion()
+
+	virtual void On005Numeric(std::string &output)
 	{
-		return Version(1,0,0,1);
+		InsertMode(output,"K",4);
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+
+	virtual ~ModuleKnock()
 	{
-		// check if this is our mode character...
-		if ((modechar == 'K') && (type == MT_CHANNEL))
-  		{
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		DELETE(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.
@@ -103,9 +150,9 @@ class ModuleKnockFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleKnock;
+		return new ModuleKnock(Me);
 	}
 	
 };