X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=96ea66d7b0e505294a6d8557255caebd02ce2b6b;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=5664e79ab8f603a879530fda29ebfb5630ce5678;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 5664e79ab..96ea66d7b 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -21,25 +21,28 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for /KNOCK and mode +K */
-
 /** Handles the /KNOCK command
  */
 class CommandKnock : public Command
 {
+	SimpleChannelModeHandler& noknockmode;
+	ChanModeReference inviteonlymode;
+
  public:
-	CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2)
+	bool sendnotice;
+	bool sendnumeric;
+	CommandKnock(Module* Creator, SimpleChannelModeHandler& Noknockmode)
+		: Command(Creator,"KNOCK", 2, 2)
+		, noknockmode(Noknockmode)
+		, inviteonlymode(Creator, "inviteonly")
 	{
 		syntax = "<channel> <reason>";
 		Penalty = 5;
-		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		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());
@@ -52,26 +55,25 @@ class CommandKnock : public Command
 			return CMD_FAILURE;
 		}
 
-		if (c->IsModeSet('K'))
+		if (c->IsModeSet(noknockmode))
 		{
 			user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), c->name.c_str());
 			return CMD_FAILURE;
 		}
 
-		if (!c->IsModeSet('i'))
+		if (!c->IsModeSet(inviteonlymode))
 		{
 			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;
 		}
 
-		for (int i = 1; i < (int)parameters.size() - 1; i++)
-		{
-			line = line + parameters[i] + " ";
-		}
-		line = line + parameters[parameters.size()-1];
+		if (sendnotice)
+			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), user->nick.c_str(), c->name.c_str(), parameters[1].c_str());
+
+		if (sendnumeric)
+			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "710 %s %s %s :is KNOCKing: %s", c->name.c_str(), c->name.c_str(), user->GetFullHost().c_str(), parameters[1].c_str());
 
-		c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(),  "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());
+		user->WriteNotice("KNOCKing on " + c->name);
 		return CMD_SUCCESS;
 	}
 
@@ -81,35 +83,51 @@ class CommandKnock : public Command
 	}
 };
 
-/** Handles channel mode +K
- */
-class Knock : public SimpleChannelModeHandler
-{
- public:
-	Knock(Module* Creator) : SimpleChannelModeHandler(Creator, "noknock", 'K') { }
-};
-
 class ModuleKnock : public Module
 {
+	SimpleChannelModeHandler kn;
 	CommandKnock cmd;
-	Knock kn;
+
  public:
-	ModuleKnock() : cmd(this), kn(this)
+	ModuleKnock()
+		: kn(this, "noknock", 'K')
+		, cmd(this, kn)
 	{
-		if (!ServerInstance->Modes->AddMode(&kn))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->AddCommand(&cmd);
-
 	}
 
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(kn);
+		ServerInstance->Modules->AddService(cmd);
+
+		OnRehash(NULL);
+	}
 
-	virtual ~ModuleKnock()
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
+		std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify");
+		irc::string notify(knocknotify.c_str());
+
+		if (notify == "numeric")
+		{
+			cmd.sendnotice = false;
+			cmd.sendnumeric = true;
+		}
+		else if (notify == "both")
+		{
+			cmd.sendnotice = true;
+			cmd.sendnumeric = true;
+		}
+		else
+		{
+			cmd.sendnotice = true;
+			cmd.sendnumeric = false;
+		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for /KNOCK and mode +K", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
 	}
 };