X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_qline.cpp;h=aa8933580cbe30c06a17dfe07b80a1e2c642f1c4;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=3bffa2f343b8d2ea7fefe26c6bd54fee13094600;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 3bffa2f34..aa8933580 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -19,7 +20,7 @@
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_qline(Instance);
 }
@@ -37,17 +38,24 @@ CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 			return CMD_FAILURE;
 		}
 
-		ServerInstance->XLines->add_qline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddQLine,OnAddQLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-		if (!ServerInstance->Duration(parameters[1]))
+		if (ServerInstance->XLines->add_qline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
-		}
-		else
-		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			int to_apply = APPLY_QLINES;
+
+			FOREACH_MOD(I_OnAddQLine,OnAddQLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+			if (!ServerInstance->Duration(parameters[1]))
+			{
+				to_apply |= APPLY_PERM_ONLY;
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
+			}
+			else
+			{
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0],
+					  ServerInstance->TimeString(c_requires_crap).c_str());
+			}
+			ServerInstance->XLines->apply_lines(to_apply);
 		}
-		ServerInstance->XLines->apply_lines(APPLY_QLINES);
 	}
 	else
 	{