X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=8d2aa4543065be26e7b410ef41007c6d664cd37d;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=46350d59d95bc92ccd481609e5f8551ad375acad;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 46350d59d..8d2aa4543 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -1,36 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2004-2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for /KNOCK and mode +K */
+/* $ModDesc: Provides support for /KNOCK and channel mode +K */
 
 /** Handles the /KNOCK command
  */
 class CommandKnock : public Command
 {
  public:
-	CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2)
+	bool sendnotice;
+	bool sendnumeric;
+	CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2, 2)
 	{
 		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());
@@ -49,26 +58,25 @@ class CommandKnock : public Command
 			return CMD_FAILURE;
 		}
 
-		if (!c->modes[CM_INVITEONLY])
+		if (!c->IsModeSet('i'))
 		{
 			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,  "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());
 		return CMD_SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return ROUTE_BROADCAST;
+		return ROUTE_OPT_BCAST;
 	}
 };
 
@@ -77,7 +85,7 @@ class CommandKnock : public Command
 class Knock : public SimpleChannelModeHandler
 {
  public:
-	Knock(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'K') { }
+	Knock(Module* Creator) : SimpleChannelModeHandler(Creator, "noknock", 'K') { }
 };
 
 class ModuleKnock : public Module
@@ -85,23 +93,44 @@ class ModuleKnock : public Module
 	CommandKnock cmd;
 	Knock kn;
  public:
-	ModuleKnock(InspIRCd* Me) : Module(Me), cmd(this), kn(Me, this)
+	ModuleKnock() : cmd(this), kn(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&kn))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->AddCommand(&cmd);
-
 	}
 
+	void init()
+	{
+		ServerInstance->Modules->AddService(kn);
+		ServerInstance->Modules->AddService(cmd);
 
-	virtual ~ModuleKnock()
+		ServerInstance->Modules->Attach(I_OnRehash, this);
+		OnRehash(NULL);
+	}
+
+	void OnRehash(User* user)
 	{
-		ServerInstance->Modes->DelMode(&kn);
+		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()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
 	}
 };