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

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

diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp
index 18a661b24ec3f7569a9b327a8743fda8ffd1ec79..dc4fd09862c8bd00a994e09d466524d286729d50 100644 (file)
--- a/src/coremods/core_xline/cmd_gline.cpp
+++ b/src/coremods/core_xline/cmd_gline.cpp
@@ -1,8 +1,16 @@
 /*
  * 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 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-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
@@ -20,27 +28,18 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "core_xline.h"
 
-/** Handle /GLINE.
- */
-class CommandGline : public Command
+CommandGline::CommandGline(Module* parent)
+       : Command(parent, "GLINE", 1, 3)
 {
- public:
-       /** Constructor for gline.
-        */
-       CommandGline (Module* parent) : Command(parent,"GLINE",1,3) { flags_needed = 'o'; Penalty = 0; syntax = "<ident@host> [<duration> :<reason>]"; }
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
-
+       flags_needed = 'o';
+       syntax = "<user@host> [<duration> :<reason>]";
+}
 
 /** Handle /GLINE
  */
-CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandGline::Handle(User* user, const Params& parameters)
 {
        std::string target = parameters[0];
 
@@ -59,33 +58,38 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 
                if (ih.first.empty())
                {
-                       user->WriteNotice("*** Target not found");
+                       user->WriteNotice("*** Target not found.");
                        return CMD_FAILURE;
                }
 
-               if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
+               InsaneBan::IPHostMatcher matcher;
+               if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "G", "hostmasks"))
                        return CMD_FAILURE;
 
                else if (target.find('!') != std::string::npos)
                {
-                       user->WriteNotice("*** G-Line cannot operate on nick!user@host masks");
+                       user->WriteNotice("*** G-line cannot operate on nick!user@host masks.");
                        return CMD_FAILURE;
                }
 
-               unsigned long duration = InspIRCd::Duration(parameters[1]);
+               unsigned long duration;
+               if (!InspIRCd::Duration(parameters[1], duration))
+               {
+                       user->WriteNotice("*** Invalid duration for G-line.");
+                       return CMD_FAILURE;
+               }
                GLine* gl = new GLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
                if (ServerInstance->XLines->AddLine(gl, user))
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s: %s",user->nick.c_str(),target.c_str(), parameters[2].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent G-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 G-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 G-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());
                        }
 
                        ServerInstance->XLines->ApplyLines();
@@ -93,23 +97,23 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
                else
                {
                        delete gl;
-                       user->WriteNotice("** G-Line for " + target + " already exists");
+                       user->WriteNotice("** G-line for " + target + " already exists.");
                }
 
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(target.c_str(),"G",user))
+               std::string reason;
+
+               if (ServerInstance->XLines->DelLine(target.c_str(), "G", reason, user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed G-line on %s",user->nick.c_str(),target.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x', "%s removed G-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
                }
                else
                {
-                       user->WriteNotice("*** G-Line " + target + " not found in list, try /stats g.");
+                       user->WriteNotice("*** G-line " + target + " not found on the list.");
                }
        }
 
        return CMD_SUCCESS;
 }
-
-COMMAND_INIT(CommandGline)