Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

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

diff --git a/src/commands/cmd_die.cpp b/src/commands/cmd_die.cpp
index 4ef9e43018088ac51390f2711ab535ccb4437770..6424584e314d749da4966f4974319e7c2b2dbe69 100644 (file)
--- a/src/commands/cmd_die.cpp
+++ b/src/commands/cmd_die.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,13 +22,15 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /DIE
  */
-CmdResult CommandDie::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandDie::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (!strcmp(parameters[0],ServerInstance->Config->diepass))
+       if (!ServerInstance->PassCompare(user, ServerInstance->Config->diepass, parameters[0].c_str(), ServerInstance->Config->powerhash))
        {
-               std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
-               ServerInstance->Log(SPARSE, diebuf);
-               ServerInstance->SendError(diebuf);
+               {
+                       std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
+                       ServerInstance->Logs->Log("COMMAND",SPARSE, diebuf);
+                       ServerInstance->SendError(diebuf);
+               }
                
                if (ServerInstance->Config->DieDelay)
                        sleep(ServerInstance->Config->DieDelay);
@@ -37,8 +39,8 @@ CmdResult CommandDie::Handle (const char** parameters, int pcnt, User *user)
        }
        else
        {
-               ServerInstance->Log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
-               ServerInstance->WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
+               ServerInstance->Logs->Log("COMMAND",SPARSE, "Failed /DIE command from %s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+               ServerInstance->SNO->WriteToSnoMask('A', "Failed DIE Command from %s!%s@%s.",user->nick.c_str(),user->ident.c_str(),user->host.c_str());
                return CMD_FAILURE;
        }
        return CMD_SUCCESS;