m_spanningtree Call the collision handler with the proper parameter (client ip instea...

[user/henk/code/inspircd.git] / src / modules / m_knock.cpp

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 46350d59d95bc92ccd481609e5f8551ad375acad..84838ec7f5f2bcfaa5c85775338035033503530f 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -1,19 +1,27 @@
-/*       +------------------------------------+
- *       | 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
  */
@@ -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;
@@ -61,14 +70,14 @@ class CommandKnock : public Command
                }
                line = line + parameters[parameters.size()-1];
 
-               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());
+               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());
                return CMD_SUCCESS;
        }
 
        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(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'K') { }
+       Knock(Module* Creator) : SimpleChannelModeHandler(Creator, "noknock", 'K') { }
 };
 
 class ModuleKnock : public Module
@@ -85,7 +94,7 @@ 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!");
@@ -96,12 +105,11 @@ class ModuleKnock : public Module
 
        virtual ~ModuleKnock()
        {
-               ServerInstance->Modes->DelMode(&kn);
        }
 
        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);
        }
 };