Replace OnAccessCheck with OnPreMode to remove a number of redundant checks

[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 5e6501699141e53028f95bcd9785288f99ec4657..718974908247776c49ef8327fe485901b3ad70bf 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -20,9 +20,8 @@
 class CommandKnock : public Command
 {
  public:
-       CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
+       CommandKnock (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"KNOCK", 0, 2)
        {
-               this->source = "m_knock.so";
                syntax = "<channel> <reason>";
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
@@ -66,6 +65,11 @@ class CommandKnock : public Command
                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;
+       }
 };
 
 /** Handles channel mode +K
@@ -73,31 +77,26 @@ class CommandKnock : public Command
 class Knock : public SimpleChannelModeHandler
 {
  public:
-       Knock(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'K') { }
+       Knock(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'K') { }
 };
 
 class ModuleKnock : public Module
 {
-       CommandKnock* mycommand;
-       Knock* kn;
+       CommandKnock cmd;
+       Knock kn;
  public:
-       ModuleKnock(InspIRCd* Me) : Module(Me)
+       ModuleKnock(InspIRCd* Me) : Module(Me), cmd(Me, this), kn(Me, this)
        {
-               kn = new Knock(ServerInstance);
-
-               if (!ServerInstance->Modes->AddMode(kn))
+               if (!ServerInstance->Modes->AddMode(&kn))
                        throw ModuleException("Could not add new modes!");
-
-               mycommand = new CommandKnock(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
 
        }
 
 
        virtual ~ModuleKnock()
        {
-               ServerInstance->Modes->DelMode(kn);
-               delete kn;
+               ServerInstance->Modes->DelMode(&kn);
        }
 
        virtual Version GetVersion()