m_spanningtree Replace manual string building of outgoing commands with CmdBuilder...

[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 74b4b214c57c765c1c242176cf04d0f9be5e68b8..65b9aa036349141cdcfe4164a37b1ae1f0a6b589 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -44,7 +44,7 @@ class CommandLockserv : public Command
                }
 
                locked = true;
-               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server.c_str());
+               user->WriteNumeric(988, "%s :Closed for new connections", user->server->GetName().c_str());
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
                return CMD_SUCCESS;
        }
@@ -69,7 +69,7 @@ class CommandUnlockserv : public Command
                }
 
                locked = false;
-               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server.c_str());
+               user->WriteNumeric(989, "%s :Open for new connections", user->server->GetName().c_str());
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
                return CMD_SUCCESS;
        }
@@ -89,16 +89,13 @@ class ModuleLockserv : public Module
        void init() CXX11_OVERRIDE
        {
                locked = false;
-               ServerInstance->Modules->AddService(lockcommand);
-               ServerInstance->Modules->AddService(unlockcommand);
-               Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                // Emergency way to unlock
-               if (!user) locked = false;
+               if (!status.srcuser)
+                       locked = false;
        }
 
        ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE