Handle more error cases in core_hostname_lookup.

[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 5eeebf1752bd2916785e9776ba517d6a6cede45b..095f763cca9576185a12249821f7ef974eda2e50 100644 (file)
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -27,11 +27,10 @@ CommandZline::CommandZline(Module* parent)
        : Command(parent, "ZLINE", 1, 3)
 {
        flags_needed = 'o';
-       Penalty = 0;
        syntax = "<ipmask> [<duration> :<reason>]";
 }
 
-CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandZline::Handle(User* user, const Params& parameters)
 {
        std::string target = parameters[0];
 
@@ -39,7 +38,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
        {
                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;
                }
 
@@ -59,44 +58,56 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
                        ipaddr++;
                }
 
-               if (ServerInstance->IPMatchesEveryone(ipaddr,user))
+               IPMatcher matcher;
+               if (InsaneBan::MatchesEveryone(ipaddr, matcher, user, "Z", "ipmasks"))
                        return CMD_FAILURE;
 
-               unsigned long duration = InspIRCd::Duration(parameters[1]);
+               unsigned long duration;
+               if (!InspIRCd::Duration(parameters[1], duration))
+               {
+                       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);
                if (ServerInstance->XLines->AddLine(zl,user))
                {
                        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;
                }
        }
 
        return CMD_SUCCESS;
 }
+
+bool CommandZline::IPMatcher::Check(User* user, const std::string& ip) const
+{
+       return InspIRCd::MatchCIDR(user->GetIPString(), ip, ascii_case_insensitive_map);
+}