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

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

diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index e81fc727f1c791b307edd708e983fd87b9536ea2..792b24ab100fa9d28e7e608ef578b1af7fd58ce7 100644 (file)
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -1,9 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2017-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 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Matt Smith <dz@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@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
@@ -38,7 +46,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
        {
                if (target.find('!') != std::string::npos)
                {
-                       user->WriteNotice("*** You cannot include a nickname in a zline, a zline must ban only an IP mask");
+                       user->WriteNotice("*** You cannot include a nickname in a Z-line, a Z-line must ban only an IP mask.");
                        return CMD_FAILURE;
                }
 
@@ -65,7 +73,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
                unsigned long duration;
                if (!InspIRCd::Duration(parameters[1], duration))
                {
-                       user->WriteNotice("*** Invalid duration for Z-line");
+                       user->WriteNotice("*** Invalid duration for Z-line.");
                        return CMD_FAILURE;
                }
                ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
@@ -73,32 +81,33 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s: %s", user->nick.c_str(), ipaddr, parameters[2].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent Z-line for %s: %s", user->nick.c_str(), ipaddr, 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 Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr,
-                                               timestr.c_str(), parameters[2].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed Z-line for %s, expires in %s (on %s): %s",
+                                       user->nick.c_str(), ipaddr, InspIRCd::DurationString(duration).c_str(),
+                                       InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
                        }
                        ServerInstance->XLines->ApplyLines();
                }
                else
                {
                        delete zl;
-                       user->WriteNotice("*** Z-Line for " + std::string(ipaddr) + " already exists");
+                       user->WriteNotice("*** Z-line for " + std::string(ipaddr) + " already exists.");
                }
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
+               std::string reason;
+
+               if (ServerInstance->XLines->DelLine(target.c_str(), "Z", reason, user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed Z-line on %s",user->nick.c_str(),target.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x', "%s removed Z-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
                }
                else
                {
-                       user->WriteNotice("*** Z-Line " + target + " not found in list, try /stats Z.");
+                       user->WriteNotice("*** Z-line " + target + " not found on the list.");
                        return CMD_FAILURE;
                }
        }