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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 2a9fd30fa..8779804c5 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -33,16 +33,24 @@ class cmd_knock : public command_t
 	cmd_knock () : command_t("KNOCK", 0, 2)
 	{
 		this->source = "m_knock.so";
+		syntax = "<channel> <reason>";
 	}
 	
-	void Handle (char **parameters, int pcnt, userrec *user)
+	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		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->IsCustomModeSet('K'))
+		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;
 		}
 
@@ -52,65 +60,81 @@ class cmd_knock : public command_t
 		}
 		line = line + std::string(parameters[pcnt-1]);
 
-		if (c->binarymodes & CM_INVITEONLY)
+		if (c->modes[CM_INVITEONLY])
 		{
-			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);
+			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
 		{
-			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;
 		}
 	}
 };
 
+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)
+	{
+		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(Server* Me)
-		: Module::Module(Me)
+	ModuleKnock(Server* Me) : Module::Module(Me)
 	{
 		Srv = Me;
-		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
+		kn = new Knock();
+		Srv->AddMode(kn, 'K');
 		mycommand = new cmd_knock();
 		Srv->AddCommand(mycommand);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+		List[I_On005Numeric] = 1;
 	}
 
-        virtual void On005Numeric(std::string &output)
-        {
+	virtual void On005Numeric(std::string &output)
+	{
 		InsertMode(output,"K",4);
-        }
+	}
 
 	virtual ~ModuleKnock()
 	{
+		DELETE(kn);
 	}
-	
+
 	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.