X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_gline.cpp;h=d1432bd0c27630bdb02c98d020d1ad833d19d8d3;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=5285383cc958d4ba5cf8bc0b0513e602445ec8d4;hpb=7b0568e9d134e7aea9ea39f75b91ac36c487466b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 5285383cc..d1432bd0c 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -3,82 +3,77 @@
  *       +------------------------------------+
  *
  *  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.
  *
  * ---------------------------------------------------
  */
 
-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_gline.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_gline(Instance);
+}
 
-void cmd_gline::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /GLINE
+ */
+CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (host_matches_everyone(parameters[0],user))
-			return;
+		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+			return CMD_FAILURE;
 
-		add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration(parameters[1]), user, parameters[2], parameters[0]));
+		if (!strchr(parameters[0],'@'))
+		{       
+			user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+			return CMD_FAILURE;
+		}
 
-		if (!duration(parameters[1]))
+		if (ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
 		{
-			WriteOpers("*** %s added permenant G-line for %s.",user->nick,parameters[0]);
+			FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+
+			if (!ServerInstance->Duration(parameters[1]))
+			{
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
+			}
+			else
+			{
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			}
+
+			ServerInstance->XLines->apply_lines(APPLY_GLINES);
 		}
 		else
 		{
-			WriteOpers("*** %s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
 		}
 
-		apply_lines(APPLY_GLINES);
 	}
 	else
 	{
-		if (del_gline(parameters[0]))
+		if (ServerInstance->XLines->del_gline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0]));
-			WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			WriteServ(user->fd,"NOTICE %s :*** G-Line %s not found in list, try /stats g.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,parameters[0]);
 		}
 	}
-}
 
+	return CMD_SUCCESS;
+}