Take some debug crap out of ModeParser::ModeString()

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

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 17fdeed16352591e81bace9a6849f14dd4c1153d..9b24489b81e4c9bdf82ef3d2a460ba750dd4af6d 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -14,38 +14,42 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-
 #include "commands/cmd_zline.h"
 
 
 
-void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_zline(Instance);
+}
+
+CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
                if (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);
-                       return;
+                       return CMD_FAILURE;
                }
+
                if (ServerInstance->IPMatchesEveryone(parameters[0],user))
-                       return;
+                       return CMD_FAILURE;
+
                ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
                if (!ServerInstance->Duration(parameters[1]))
                {
-                       ServerInstance->WriteOpers("*** %s added permanent Z-line for %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
                ServerInstance->XLines->apply_lines(APPLY_ZLINES);
        }
@@ -54,11 +58,14 @@ void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->XLines->del_zline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-                       ServerInstance->WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
                }
                else
                {
                        user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+                       return CMD_FAILURE;
                }
        }
+
+       return CMD_SUCCESS;
 }