From 1b03dfaeec9b4e4668fe1c02af93ebf4e7f82f73 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Thu, 13 Sep 2012 01:15:44 +0200
Subject: m_knock Add support for sending a 710 numeric when a KNOCK succeeds,
 add a config option to choose between behaviors Fixes #287 reported by
 @ElementalAlchemist

---
 src/modules/m_knock.cpp | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 8cd5088bc..97eb0e005 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -28,6 +28,8 @@
 class CommandKnock : public Command
 {
  public:
+	bool sendnotice;
+	bool sendnumeric;
 	CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2, 2)
 	{
 		syntax = "<channel> <reason>";
@@ -62,7 +64,12 @@ class CommandKnock : public Command
 			return CMD_FAILURE;
 		}
 
-		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 (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());
+
 		user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
 		return CMD_SUCCESS;
 	}
@@ -92,11 +99,30 @@ class ModuleKnock : public Module
 			throw ModuleException("Could not add new modes!");
 		ServerInstance->AddCommand(&cmd);
 
+		ServerInstance->Modules->Attach(I_OnRehash, this);
+		OnRehash(NULL);
 	}
 
-
-	virtual ~ModuleKnock()
+	void OnRehash(User* user)
 	{
+		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()
-- 
cgit v1.2.3