Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / src / coremods / core_oper / cmd_die.cpp

diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp
index ff9318de1e7681ac49e950d4042006f3a4281178..b25fe24076e23d66605ed14ce6c1461b722a42aa 100644 (file)
--- a/src/coremods/core_oper/cmd_die.cpp
+++ b/src/coremods/core_oper/cmd_die.cpp
@@ -39,7 +39,8 @@ static void QuitAll()
 
 void DieRestart::SendError(const std::string& message)
 {
-       const std::string unregline = "ERROR :" + message;
+       ClientProtocol::Messages::Error errormsg(message);
+       ClientProtocol::Event errorevent(ServerInstance->GetRFCEvents().error, errormsg);
        const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
        for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
        {
@@ -51,20 +52,20 @@ void DieRestart::SendError(const std::string& message)
                else
                {
                        // Unregistered connections receive ERROR, not a NOTICE
-                       user->Write(unregline);
+                       user->Send(errorevent);
                }
        }
 }
 
 /** Handle /DIE
  */
-CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandDie::Handle(User* user, const Params& parameters)
 {
        if (DieRestart::CheckPass(user, parameters[0], "diepass"))
        {
                {
                        std::string diebuf = "*** DIE command from " + user->GetFullHost() + ". Terminating.";
-                       ServerInstance->Logs->Log("COMMAND", LOG_SPARSE, diebuf);
+                       ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, diebuf);
                        DieRestart::SendError(diebuf);
                }
 
@@ -73,7 +74,7 @@ CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *
        }
        else
        {
-               ServerInstance->Logs->Log("COMMAND", LOG_SPARSE, "Failed /DIE command from %s", user->GetFullRealHost().c_str());
+               ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Failed /DIE command from %s", user->GetFullRealHost().c_str());
                ServerInstance->SNO->WriteGlobalSno('a', "Failed DIE Command from %s.", user->GetFullRealHost().c_str());
                return CMD_FAILURE;
        }