X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=afc3cfa02259c160f1e1b3fbd915d0a43533f301;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=649c210b8bdd2040bf816d389ad9d272da6ada9a;hpb=06b12b71ae73cdfceba122e6400dd97830c8cea9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 649c210b8..afc3cfa02 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,102 +14,129 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
+#include "configreader.h"
+#include "inspircd.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 = "";
 
-	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 (InspIRCd* Instance) : command_t(Instance,"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,"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 = ServerInstance->FindChan(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*)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
+		{
+			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(InspIRCd* Instance) : ModeHandler(Instance, '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(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = new Server;
 		
-		Srv->AddExtendedMode('K',MT_CHANNEL,false,0,0);
-		Srv->AddCommand("KNOCK",handle_knock,0,2,"m_knock.so");
+		kn = new Knock(ServerInstance);
+		ServerInstance->AddMode(kn, 'K');
+		mycommand = new cmd_knock(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 
-        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())
-		{
-	                output = temp2.substr(0,temp2.length()-1) + std::string(" KNOCK");
-		}
-		else output = output + std::string(" KNOCK");
-        }
+	void Implements(char* List)
+	{
+		List[I_On005Numeric] = 1;
+	}
+
+	virtual void On005Numeric(std::string &output)
+	{
+		ServerInstance->ModeGrok->InsertMode(output,"K",4);
+	}
 
 	virtual ~ModuleKnock()
 	{
-		delete Srv;
+		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.
@@ -125,9 +152,9 @@ class ModuleKnockFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleKnock;
+		return new ModuleKnock(Me);
 	}
 	
 };