Jesus, look who's the commit whore today. More header updates, and removal of namespa...

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

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 7ffe5cd738dae3ab20fdd37abce0acdbf681e952..c0ddf0db69b54ec69fd51574c8fb2efb7f294778 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -2,85 +2,67 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_eline.h"
+#include "commands/cmd_zline.h"
+
+
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_zline(Instance);
+}
 
-void cmd_zline::Handle (char **parameters, int pcnt, userrec *user)
+CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
                if (strchr(parameters[0],'@'))
                {
-                       WriteServ(user->fd,"NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick);
-                       return;
+                       user->WriteServ("NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick);
+                       return CMD_FAILURE;
                }
-               if (ip_matches_everyone(parameters[0],user))
-                       return;
-               add_zline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration(parameters[1]), user, parameters[2], parameters[0]));
-               if (!duration(parameters[1]))
+
+               if (ServerInstance->IPMatchesEveryone(parameters[0],user))
+                       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]))
                {
-                       WriteOpers("*** %s added permenant Z-line for %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],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]));
                }
-               apply_lines(APPLY_ZLINES);
+               ServerInstance->XLines->apply_lines(APPLY_ZLINES);
        }
        else
        {
-               if (del_zline(parameters[0]))
+               if (ServerInstance->XLines->del_zline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-                       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
                {
-                       WriteServ(user->fd,"NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+                       return CMD_FAILURE;
                }
        }
-}
-
 
+       return CMD_SUCCESS;
+}