Merge branch 'insp20' into insp3.

[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 4700e9fd2a04a5f765eaaaf6bf780a91afd82749..2a9f192ba57275e164704d5388418d99e38f527e 100644 (file)
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -26,7 +26,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
@@ -69,14 +69,13 @@ 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
@@ -95,7 +94,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
                }
                else
                {
-                       user->WriteNotice("*** E-line " + target + " not found in list, try /stats e.");
+                       user->WriteNotice("*** E-line " + target + " not found on the list.");
                }
        }