X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_qline.cpp;h=d1f717c8f31c0afdb42113bd1b8fa6bfceeab247;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=e1bec6ddcb2a2a8679736f31bca4a8bae742629c;hpb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index e1bec6ddc..d1f717c8f 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -20,23 +17,44 @@
 #include "xline.h"
 #include "commands/cmd_qline.h"
 
-void cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_qline(Instance);
+}
+
+CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
 		if (ServerInstance->NickMatchesEveryone(parameters[0],user))
-			return;
-		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]))
+			return CMD_FAILURE;
+
+		if (strchr(parameters[0],'@') || strchr(parameters[0],'!') || strchr(parameters[0],'.'))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.",user->nick);
+			return CMD_FAILURE;
 		}
-		else
+
+		if (ServerInstance->XLines->add_qline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
 		{
-			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],
+						ctime(&c_requires_crap));
+			}
+			ServerInstance->XLines->apply_lines(to_apply);
 		}
-		ServerInstance->XLines->apply_lines(APPLY_QLINES);
 	}
 	else
 	{
@@ -48,6 +66,10 @@ void cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 		else
 		{
 			user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]);
+			return CMD_FAILURE;
 		}
 	}
+
+	return CMD_SUCCESS;
 }
+