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

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index d167e698b..d1432bd0c 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -14,44 +14,52 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
+#include "commands/cmd_gline.h"
 
-#include "commands/cmd_eline.h"
-
-
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_gline(Instance);
+}
 
-void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /GLINE
+ */
+CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
 		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
-			return;
+			return CMD_FAILURE;
 
 		if (!strchr(parameters[0],'@'))
 		{       
 			user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-			return;
+			return CMD_FAILURE;
 		}
 
-		ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-
-		if (!ServerInstance->Duration(parameters[1]))
+		if (ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent 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
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
 		}
 
-		ServerInstance->XLines->apply_lines(APPLY_GLINES);
 	}
 	else
 	{
@@ -62,7 +70,10 @@ void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 		else
 		{
-			user->WriteServ("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;
 }
+