Refactor port binding, warning not yet tested fully

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

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 46d24f3bd11a7b4c3d35d368fc533ac55c190511..70ca81664a67a2972f4e743226e68fa477230104 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -29,9 +29,9 @@ CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
-               if (strchr(parameters[0],'@'))
+               if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
                {
-                       user->WriteServ("NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick);
+                       user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
                        return CMD_FAILURE;
                }
 
@@ -50,7 +50,9 @@ CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                               time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0],
+                                               ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                        ServerInstance->XLines->apply_lines(to_apply);
                }