X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_knock.cpp;h=5664e79ab8f603a879530fda29ebfb5630ce5678;hb=46a39046196f55b52336e19662bb7bac85b731ac;hp=a266d0aa5d6efdd9078fcd9c08dc688526fbcf34;hpb=de25d946733f774e3a5b53a58438a9c92af0acbe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index a266d0aa5..5664e79ab 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | 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 */
@@ -23,6 +31,7 @@ class CommandKnock : public Command
 	CommandKnock(Module* Creator) : Command(Creator,"KNOCK", 2)
 	{
 		syntax = "<channel> <reason>";
+		Penalty = 5;
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
@@ -49,7 +58,7 @@ 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;
@@ -68,7 +77,7 @@ class CommandKnock : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return ROUTE_BROADCAST;
+		return ROUTE_OPT_BCAST;
 	}
 };
 
@@ -77,7 +86,7 @@ class CommandKnock : public Command
 class Knock : public SimpleChannelModeHandler
 {
  public:
-	Knock(Module* Creator) : SimpleChannelModeHandler(Creator, 'K') { }
+	Knock(Module* Creator) : SimpleChannelModeHandler(Creator, "noknock", 'K') { }
 };
 
 class ModuleKnock : public Module
@@ -96,12 +105,11 @@ class ModuleKnock : public Module
 
 	virtual ~ModuleKnock()
 	{
-		ServerInstance->Modes->DelMode(&kn);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for /KNOCK and mode +K", VF_OPTCOMMON | VF_VENDOR);
 	}
 };