X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_gline.cpp;h=afec3889c5f855ae2bb2636645fc2e3ce3313463;hb=16add8425c1cdc77aa72c13cbd3070b31acd6f22;hp=39118c36996fd7d6cc79bcb43941e376c64d651c;hpb=296661c5c59e9ea939cb8246530ca5c15af273d9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 39118c369..afec3889c 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);
 }
@@ -42,20 +43,23 @@ CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 			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);