X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_knock.cpp;h=afc3cfa02259c160f1e1b3fbd915d0a43533f301;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=e1c02174303a70d05c595259cf952dc4d0c4ec72;hpb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index e1c021743..afc3cfa02 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -22,15 +22,17 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "configreader.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-static Server *Srv;
+
 
 class cmd_knock : public command_t
 {
  public:
-	cmd_knock () : command_t("KNOCK", 0, 2)
+ cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2)
 	{
 		this->source = "m_knock.so";
 		syntax = "<channel> <reason>";
@@ -38,11 +40,11 @@ class cmd_knock : public command_t
 	
 	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		chanrec* c = Srv->FindChannel(parameters[0]);
+		chanrec* c = ServerInstance->FindChan(parameters[0]);
 
 		if (!c)
 		{
-			WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
+			user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
 			return;
 		}
 
@@ -50,7 +52,7 @@ class cmd_knock : public command_t
 
 		if (c->IsModeSet('K'))
 		{
-			WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+			user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
 			return;
 		}
 
@@ -62,13 +64,13 @@ class cmd_knock : public command_t
 
 		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());
-			WriteServ(user->fd,"NOTICE %s :KNOCKing on %s",user->nick,c->name);
+			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
 		{
-			WriteServ(user->fd,"480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
+			user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
 			return;
 		}
 	}
@@ -77,7 +79,7 @@ class cmd_knock : public command_t
 class Knock : public ModeHandler
 {
  public:
-	Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	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)
 	{
@@ -107,13 +109,13 @@ class ModuleKnock : public Module
 	cmd_knock* mycommand;
 	Knock* kn;
  public:
-	ModuleKnock(Server* Me) : Module::Module(Me)
+	ModuleKnock(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		kn = new Knock();
-		Srv->AddMode(kn, 'K');
-		mycommand = new cmd_knock();
-		Srv->AddCommand(mycommand);
+		
+		kn = new Knock(ServerInstance);
+		ServerInstance->AddMode(kn, 'K');
+		mycommand = new cmd_knock(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 
 	void Implements(char* List)
@@ -123,7 +125,7 @@ class ModuleKnock : public Module
 
 	virtual void On005Numeric(std::string &output)
 	{
-		InsertMode(output,"K",4);
+		ServerInstance->ModeGrok->InsertMode(output,"K",4);
 	}
 
 	virtual ~ModuleKnock()
@@ -150,7 +152,7 @@ class ModuleKnockFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleKnock(Me);
 	}