Allow support for multiple dns results per request. This is a significant change...

[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 d850ed35bf0da16a70468b71eddb5ba82ea81d87..8e7e14481dfa78398cc0b870f68279d0252be9f1 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -11,13 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
@@ -42,7 +39,7 @@ class cmd_knock : public command_t
                        return CMD_FAILURE;
                }
 
-               std::string line = "";
+               std::string line;
 
                if (c->IsModeSet('K'))
                {
@@ -56,18 +53,14 @@ class cmd_knock : public command_t
                }
                line = line + std::string(parameters[pcnt-1]);
 
-               if (c->modes[CM_INVITEONLY])
-               {
-                       c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str());
-                       user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick,c->name);
-                       return CMD_SUCCESS;
-               }
-               else
+               if (!c->modes[CM_INVITEONLY])
                {
                        user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name);
                        return CMD_FAILURE;
                }
 
+               c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName,  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str());
+               user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick,c->name);
                return CMD_SUCCESS;
        }
 };
@@ -107,7 +100,7 @@ class ModuleKnock : public Module
        cmd_knock* mycommand;
        Knock* kn;
  public:
-       ModuleKnock(InspIRCd* Me) : Module::Module(Me)
+       ModuleKnock(InspIRCd* Me) : Module(Me)
        {
                
                kn = new Knock(ServerInstance);
@@ -129,33 +122,8 @@ class ModuleKnock : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
-       }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleKnockFactory : public ModuleFactory
-{
- public:
-       ModuleKnockFactory()
-       {
-       }
-       
-       ~ModuleKnockFactory()
-       {
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleKnock(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)