More AddModes fixes

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

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index f3ac9334765e4a96e6359a6740a4e48772969902..d2bfff6a54aead2eb88f7efd5c3e21dcf95edb7e 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -11,12 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
-
 /* $ModDesc: Allows locking of the server to stop all incoming connections till unlocked again */
 
 /** Adds numerics
@@ -25,20 +21,20 @@
 */
 
 
-class cmd_lockserv : public command_t
+class CommandLockserv : public Command
 {
 private:
        bool& locked;
 
 public:
-       cmd_lockserv (InspIRCd* Instance, bool &lock)
-       : command_t(Instance, "LOCKSERV", 'o', 0), locked(lock)
+       CommandLockserv (InspIRCd* Instance, bool &lock)
+       : Command(Instance, "LOCKSERV", 'o', 0), locked(lock)
        {
                this->source = "m_lockserv.so";
-               syntax = "";
+               syntax.clear();
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                locked = true;
                user->WriteServ("988 %s %s :Closed for new connections", user->nick, user->server);
@@ -48,20 +44,20 @@ public:
        }
 };
 
-class cmd_unlockserv : public command_t
+class CommandUnlockserv : public Command
 {
 private:
        bool& locked;
 
 public:
-       cmd_unlockserv (InspIRCd* Instance, bool &lock)
-       : command_t(Instance, "UNLOCKSERV", 'o', 0), locked(lock)
+       CommandUnlockserv (InspIRCd* Instance, bool &lock)
+       : Command(Instance, "UNLOCKSERV", 'o', 0), locked(lock)
        {
                this->source = "m_lockserv.so";
-               syntax = "";
+               syntax.clear();
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                locked = false;
                user->WriteServ("989 %s %s :Open for new connections", user->nick, user->server);
@@ -75,8 +71,8 @@ class ModuleLockserv : public Module
 {
 private:
        bool locked;
-       cmd_lockserv* lockcommand;
-       cmd_unlockserv* unlockcommand;
+       CommandLockserv* lockcommand;
+       CommandUnlockserv* unlockcommand;
 
        virtual void ResetLocked()
        {
@@ -84,13 +80,13 @@ private:
        }
 
 public:
-       ModuleLockserv(InspIRCd* Me) : Module::Module(Me)
+       ModuleLockserv(InspIRCd* Me) : Module(Me)
        {
                ResetLocked();
-               lockcommand = new cmd_lockserv(ServerInstance, locked);
+               lockcommand = new CommandLockserv(ServerInstance, locked);
                ServerInstance->AddCommand(lockcommand);
 
-               unlockcommand = new cmd_unlockserv(ServerInstance, locked);
+               unlockcommand = new CommandUnlockserv(ServerInstance, locked);
                ServerInstance->AddCommand(unlockcommand);
        }
 
@@ -103,22 +99,22 @@ public:
                List[I_OnUserRegister] = List[I_OnRehash] = List[I_OnCheckReady] = 1;
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ResetLocked();
        }
 
-       virtual int OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                if (locked)
                {
-                       userrec::QuitUser(ServerInstance, user, "Server is temporarily closed. Please try again later.");
+                       User::QuitUser(ServerInstance, user, "Server is temporarily closed. Please try again later.");
                        return 1;
                }
                return 0;
        }
 
-       virtual bool OnCheckReady(userrec* user)
+       virtual bool OnCheckReady(User* user)
        {
                return !locked;
        }
@@ -129,24 +125,4 @@ public:
        }
 };
 
-class ModuleLockservFactory : public ModuleFactory
-{
-public:
-       ModuleLockservFactory()
-       {
-       }
-
-       ~ModuleLockservFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleLockserv(Me);
-       }
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleLockservFactory;
-}
+MODULE_INIT(ModuleLockserv)