None of the modules use an extern InspIRCd* any more

[user/henk/code/inspircd.git] / src / modules / m_nicklock.cpp

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index e46b56901fe1c63907ef67c575c4a87628dcdf3e..16f6aafa62536ab90f57168cc589f69e3af96e9a 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -23,17 +23,17 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
 
 class cmd_nicklock : public command_t
 {
        char* dummy;
  public:
-       cmd_nicklock () : command_t("NICKLOCK", 'o', 2)
+ cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
        {
                this->source = "m_nicklock.so";
                syntax = "<oldnick> <newnick>";
@@ -41,7 +41,7 @@ class cmd_nicklock : public command_t
 
        void Handle(const char** parameters, int pcnt, userrec *user)
        {
-               userrec* source = Srv->FindNick(std::string(parameters[0]));
+               userrec* source = ServerInstance->FindNick(parameters[0]);
                irc::string server;
                irc::string me;
 
@@ -52,10 +52,10 @@ class cmd_nicklock : public command_t
                                user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
                                return;
                        }
-                       if (Srv->IsNick(std::string(parameters[1])))
+                       if (ServerInstance->IsNick(parameters[1]))
                        {
                                // give them a lock flag
-                               Srv->SendOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+std::string(parameters[0])+" to "+parameters[1]);
+                               ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
                                if (!source->ForceNickChange(parameters[1]))
                                {
                                        userrec::QuitUser(ServerInstance, source, "Nickname collision");
@@ -70,7 +70,7 @@ class cmd_nicklock : public command_t
 class cmd_nickunlock : public command_t
 {
  public:
-       cmd_nickunlock () : command_t("NICKUNLOCK", 'o', 1)
+ cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
        {
                this->source = "m_nickunlock.so";
                syntax = "<locked-nick>";
@@ -78,12 +78,12 @@ class cmd_nickunlock : public command_t
 
        void Handle (const char** parameters, int pcnt, userrec *user)
        {
-               userrec* source = Srv->FindNick(std::string(parameters[0]));
+               userrec* source = ServerInstance->FindNick(parameters[0]);
                if (source)
                {
                        source->Shrink("nick_locked");
                        user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick);
-                       Srv->SendOpers(std::string(user->nick)+" used NICKUNLOCK on "+std::string(parameters[0]));
+                       ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
                }
        }
 };
@@ -95,14 +95,14 @@ class ModuleNickLock : public Module
        cmd_nickunlock* cmd2;
        char* n;
  public:
-       ModuleNickLock(Server* Me)
+       ModuleNickLock(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               cmd1 = new cmd_nicklock();
-               cmd2 = new cmd_nickunlock();
-               Srv->AddCommand(cmd1);
-               Srv->AddCommand(cmd2);
+               
+               cmd1 = new cmd_nicklock(ServerInstance);
+               cmd2 = new cmd_nickunlock(ServerInstance);
+               ServerInstance->AddCommand(cmd1);
+               ServerInstance->AddCommand(cmd2);
        }
        
        virtual ~ModuleNickLock()
@@ -157,7 +157,7 @@ class ModuleNickLockFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleNickLock(Me);
        }