X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_gline.cpp;h=f208d40bf6826abb339b69bb49c7f7578f39a531;hb=d49e33b22c2cbb22bad71fb07ce8003dec8270cf;hp=b5e361e820cf2f7980ca382b3a83547c24f88299;hpb=425ab67e76483e6adc424adda3c5e7357c140743;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index b5e361e82..f208d40bf 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -11,13 +11,14 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
 #include "xline.h"
 #include "commands/cmd_gline.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_gline(Instance);
 }
@@ -28,7 +29,8 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
 		if (!strchr(parameters[0],'@'))
@@ -36,21 +38,29 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 			user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
 			return CMD_FAILURE;
 		}
+		else if (strchr(parameters[0],'!'))
+		{
+			user->WriteServ("NOTICE %s :*** G-Line cannot contain a nickname!",user->nick);
+			return CMD_FAILURE;
+		}
 
-		if (ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1]);
+		if (ServerInstance->XLines->add_gline(duration,user->nick,parameters[2],parameters[0]))
 		{
 			int to_apply = APPLY_GLINES;
 
-			FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+			FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration, user, parameters[2], parameters[0]));
 
-			if (!ServerInstance->Duration(parameters[1]))
+			if (!duration)
 			{
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
 				to_apply |= APPLY_PERM_ONLY;
 			}
 			else
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+				time_t c_requires_crap = duration + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,parameters[0],
+						ServerInstance->TimeString(c_requires_crap).c_str());
 			}
 
 			ServerInstance->XLines->apply_lines(to_apply);