Use CommandBase::Params instead of std::vector<std::string>.

[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 3408e4621f278d630d859a2dcc7289588f3de3ac..45a0095d79e646fb67e74a2465a9f4f693253ca3 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -20,33 +20,38 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Allows locking of the server to stop all incoming connections till unlocked again */
-
 /** Adds numerics
  * 988 <nick> <servername> :Closed for new connections
  * 989 <nick> <servername> :Open for new connections
-*/
-
+ */
+enum
+{
+       // InspIRCd-specific.
+       RPL_SERVLOCKON = 988,
+       RPL_SERVLOCKOFF = 989
+};
 
 class CommandLockserv : public Command
 {
-       bool& locked;
-public:
-       CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
+       std::string& locked;
+
+ public:
+       CommandLockserv(Module* Creator, std::string& lock) : Command(Creator, "LOCKSERV", 0, 1), locked(lock)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o';
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (locked)
+               if (!locked.empty())
                {
-                       user->WriteServ("NOTICE %s :The server is already locked.", user->nick.c_str());
+                       user->WriteNotice("The server is already locked.");
                        return CMD_FAILURE;
                }
 
-               locked = true;
-               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server.c_str());
+               locked = parameters.empty() ? "Server is temporarily closed. Please try again later." : parameters[0];
+               user->WriteNumeric(RPL_SERVLOCKON, user->server->GetName(), "Closed for new connections");
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
                return CMD_SUCCESS;
        }
@@ -54,25 +59,24 @@ public:
 
 class CommandUnlockserv : public Command
 {
-private:
-       bool& locked;
+       std::string& locked;
 
-public:
-       CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
+ public:
+       CommandUnlockserv(Module* Creator, std::string& lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
        {
                flags_needed = 'o';
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (!locked)
+               if (locked.empty())
                {
-                       user->WriteServ("NOTICE %s :The server isn't locked.", user->nick.c_str());
+                       user->WriteNotice("The server isn't locked.");
                        return CMD_FAILURE;
                }
 
-               locked = false;
-               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server.c_str());
+               locked.clear();
+               user->WriteNumeric(RPL_SERVLOCKOFF, user->server->GetName(), "Open for new connections");
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
                return CMD_SUCCESS;
        }
@@ -80,48 +84,38 @@ public:
 
 class ModuleLockserv : public Module
 {
-private:
-       bool locked;
+       std::string locked;
        CommandLockserv lockcommand;
        CommandUnlockserv unlockcommand;
 
-public:
+ public:
        ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
        {
-               locked = false;
-               ServerInstance->AddCommand(&lockcommand);
-               ServerInstance->AddCommand(&unlockcommand);
-               Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       virtual ~ModuleLockserv()
-       {
-       }
-
-
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                // Emergency way to unlock
-               if (!user) locked = false;
+               if (!status.srcuser)
+                       locked.clear();
        }
 
-       virtual ModResult OnUserRegister(LocalUser* user)
+       ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
        {
-               if (locked)
+               if (!locked.empty())
                {
-                       ServerInstance->Users->QuitUser(user, "Server is temporarily closed. Please try again later.");
+                       ServerInstance->Users->QuitUser(user, locked);
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnCheckReady(LocalUser* user)
+       ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
        {
-               return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU;
+               return !locked.empty() ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
        }