OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

[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 1e490ad12a9bdedafd5390c6c689ab3630622674..3bc45cceb20c8f67f67c8e31686d88d84c24dd7a 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,27 +2,19 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#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 */
 
@@ -47,7 +39,7 @@ class cmd_knock : public command_t
                        return CMD_FAILURE;
                }
 
-               std::string line = "";
+               std::string line;
 
                if (c->IsModeSet('K'))
                {
@@ -61,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;
        }
 };
@@ -112,11 +100,12 @@ 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);
-               ServerInstance->AddMode(kn, 'K');
+               if (!ServerInstance->AddMode(kn, 'K'))
+                       throw ModuleException("Could not add new modes!");
                mycommand = new cmd_knock(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
@@ -133,33 +122,8 @@ class ModuleKnock : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
-       }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleKnockFactory : public ModuleFactory
-{
- public:
-       ModuleKnockFactory()
-       {
-       }
-       
-       ~ModuleKnockFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleKnock(Me);
+               return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock)