Fix merge FJOIN debug message

[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 94ab314212d216deccc25a3e3ffada8059621e7f..60a76c15d0e8940dc066d18559a46d720ea212b0 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,47 +21,47 @@
 */
 
 
-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.clear();
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                locked = true;
-               user->WriteServ("988 %s %s :Closed for new connections", user->nick, user->server);
-               ServerInstance->WriteOpers("*** Oper %s used LOCKSERV to temporarily close for new connections", user->nick);
+               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
+               ServerInstance->SNO->WriteToSnoMask('A', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
                /* Dont send to the network */
                return CMD_LOCALONLY;
        }
 };
 
-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.clear();
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                locked = false;
-               user->WriteServ("989 %s %s :Open for new connections", user->nick, user->server);
-               ServerInstance->WriteOpers("*** Oper %s used UNLOCKSERV to allow for new connections", user->nick);
+               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
+               ServerInstance->SNO->WriteToSnoMask('A', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
                /* Dont send to the network */
                return CMD_LOCALONLY;
        }
@@ -71,8 +71,8 @@ class ModuleLockserv : public Module
 {
 private:
        bool locked;
-       cmd_lockserv* lockcommand;
-       cmd_unlockserv* unlockcommand;
+       CommandLockserv* lockcommand;
+       CommandUnlockserv* unlockcommand;
 
        virtual void ResetLocked()
        {
@@ -83,45 +83,43 @@ public:
        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);
+               Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual ~ModuleLockserv()
        {
        }
 
-       void Implements(char* List)
-       {
-               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.");
+                       ServerInstance->Users->QuitUser(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;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 1, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };