Fix typos

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

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 4baeefb8fdf760664bde347594ce37748ba3e057..ff180575301d11cb3112c1e16f499f99856d5200 100644 (file)
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -28,7 +28,7 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_kline.h"
 
 void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
@@ -38,16 +38,22 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->HostMatchesEveryone(parameters[0],user))
                        return;
 
+               if (!strchr(parameters[0],'@'))
+               {       
+                       user->WriteServ("NOTICE %s :*** K-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+                       return;
+               }
+
                ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 
                if (!ServerInstance->Duration(parameters[1]))
                {
-                       ServerInstance->WriteOpers("*** %s added permanent K-line for %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
 
                ServerInstance->XLines->apply_lines(APPLY_KLINES);
@@ -57,7 +63,7 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->XLines->del_kline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
-                       ServerInstance->WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
                }
                else
                {
@@ -65,3 +71,4 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
                }
        }
 }
+