None of the modules use an extern InspIRCd* any more

[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 e681f02d674984a1b4a2ccb02c7b55e1dbe3cc17..afc3cfa02259c160f1e1b3fbd915d0a43533f301 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -22,17 +22,17 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
 
 class cmd_knock : public command_t
 {
  public:
-       cmd_knock () : command_t("KNOCK", 0, 2)
+ cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2)
        {
                this->source = "m_knock.so";
                syntax = "<channel> <reason>";
@@ -64,7 +64,7 @@ class cmd_knock : public command_t
 
                if (c->modes[CM_INVITEONLY])
                {
-                       c->WriteChannelWithServ((char*)Srv->GetServerName().c_str(),  "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str());
+                       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;
                }
@@ -79,7 +79,7 @@ class cmd_knock : public command_t
 class Knock : public ModeHandler
 {
  public:
-       Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -109,13 +109,13 @@ class ModuleKnock : public Module
        cmd_knock* mycommand;
        Knock* kn;
  public:
-       ModuleKnock(Server* Me) : Module::Module(Me)
+       ModuleKnock(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               kn = new Knock();
-               Srv->AddMode(kn, 'K');
-               mycommand = new cmd_knock();
-               Srv->AddCommand(mycommand);
+               
+               kn = new Knock(ServerInstance);
+               ServerInstance->AddMode(kn, 'K');
+               mycommand = new cmd_knock(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void Implements(char* List)
@@ -125,7 +125,7 @@ class ModuleKnock : public Module
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output,"K",4);
+               ServerInstance->ModeGrok->InsertMode(output,"K",4);
        }
 
        virtual ~ModuleKnock()
@@ -152,7 +152,7 @@ class ModuleKnockFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleKnock(Me);
        }