move opening of log before opening of config so that failure to open the config can...

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

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 670cb29501dda14c871df03315815aa897489846..ec31228ed28cccc23a4fe096a588ed2999dac75f 100644 (file)
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -11,9 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "xline.h"
 #include "commands/cmd_kline.h"
 
@@ -28,7 +26,8 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
-               if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+               IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+               if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
                if (!strchr(parameters[0],'@'))
@@ -42,26 +41,31 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
                        return CMD_FAILURE;
                }
 
-               if (ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
+               long duration = ServerInstance->Duration(parameters[1]);
+               if (ServerInstance->XLines->add_kline(duration,user->nick,parameters[2],parameters[0]))
                {
                        int to_apply = APPLY_KLINES;
 
-                       FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+                       FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], parameters[0]));
        
-                       if (!ServerInstance->Duration(parameters[1]))
+                       if (!duration)
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
                                to_apply |= APPLY_PERM_ONLY;
                        }
                        else
                        {
-                               time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+                               time_t c_requires_crap = duration + ServerInstance->Time();
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick,parameters[0],
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
 
                        ServerInstance->XLines->apply_lines(to_apply);
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]);
+               }
        }
        else
        {