Resolve /STATS S conflict between SVSHOLD and SHUN

[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 e2f9310d6e2ea097a4cb5d151fa117cbf9ce7e59..e85b3e04984910fb43748bbf3d8be64dff9c79c1 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,6 +23,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 +50,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 +62,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 +78,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 +86,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 +97,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);
        }
 };