Use a duration string for the idle time in `/STATS P`.

[user/henk/code/inspircd.git] / src / coremods / core_xline / cmd_eline.cpp

diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp
index a3a4d94667b88ab61a00d51586da2df9b80ceee8..3572a4069bb0294231a4bb9fa2c3e6b28ddf21de 100644 (file)
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -1,8 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -26,7 +33,7 @@ CommandEline::CommandEline(Module* parent)
        : Command(parent, "ELINE", 1, 3)
 {
        flags_needed = 'o';
-       syntax = "<ident@host> [<duration> :<reason>]";
+       syntax = "<user@host> [<duration> :<reason>]";
 }
 
 /** Handle /ELINE
@@ -50,7 +57,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
 
                if (ih.first.empty())
                {
-                       user->WriteNotice("*** Target not found");
+                       user->WriteNotice("*** Target not found.");
                        return CMD_FAILURE;
                }
 
@@ -61,7 +68,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
                unsigned long duration;
                if (!InspIRCd::Duration(parameters[1], duration))
                {
-                       user->WriteNotice("*** Invalid duration for E-line");
+                       user->WriteNotice("*** Invalid duration for E-line.");
                        return CMD_FAILURE;
                }
                ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
@@ -69,31 +76,32 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent E-line for %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
                        }
                        else
                        {
-                               time_t c_requires_crap = duration + ServerInstance->Time();
-                               std::string timestr = InspIRCd::TimeString(c_requires_crap);
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
-                                               timestr.c_str(), parameters[2].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed E-line for %s, expires in %s (on %s): %s",
+                                       user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(),
+                                       InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
                        }
                }
                else
                {
                        delete el;
-                       user->WriteNotice("*** E-Line for " + target + " already exists");
+                       user->WriteNotice("*** E-line for " + target + " already exists.");
                }
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(target.c_str(), "E", user))
+               std::string reason;
+
+               if (ServerInstance->XLines->DelLine(target.c_str(), "E", reason, user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed E-line on %s",user->nick.c_str(),target.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x', "%s removed E-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
                }
                else
                {
-                       user->WriteNotice("*** E-Line " + target + " not found in list, try /stats e");
+                       user->WriteNotice("*** E-line " + target + " not found on the list.");
                }
        }