X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_qline.cpp;h=43d389804da080276a6e4f92c5763d82effc96dc;hb=b0546ed55e040330dd28a856d6fab2e55863dd1f;hp=e32641e82db99a02f303fdcc563033e4b14dc4da;hpb=ce9b1289c672d3d6b9cadec865754710bc1b80f7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp
index e32641e82..43d389804 100644
--- a/src/commands/cmd_qline.cpp
+++ b/src/commands/cmd_qline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,50 +22,50 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandQline(Instance);
 }
 
-CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (pcnt >= 3)
+	if (parameters.size() >= 3)
 	{
 		if (ServerInstance->NickMatchesEveryone(parameters[0],user))
 			return CMD_FAILURE;
 
-		if (strchr(parameters[0],'@') || strchr(parameters[0],'!') || strchr(parameters[0],'.'))
+		if (parameters[0].find('@') != std::string::npos || parameters[0].find('!') != std::string::npos || parameters[0].find('.') != std::string::npos)
 		{
-			user->WriteServ("NOTICE %s :*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.",user->nick);
+			user->WriteServ("NOTICE %s :*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.",user->nick.c_str());
 			return CMD_FAILURE;
 		}
 
-		long duration = ServerInstance->Duration(parameters[1]);
-		if (ServerInstance->XLines->AddQLine(duration,user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1].c_str());
+		QLine* ql = new QLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+		if (ServerInstance->XLines->AddLine(ql,user))
 		{
-			FOREACH_MOD(I_OnAddQLine,OnAddQLine(duration, user, parameters[2], parameters[0]));
 			if (!duration)
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s: %s",user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
 			}
 			else
 			{
 				time_t c_requires_crap = duration + 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->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s: %s",user->nick.c_str(),parameters[0].c_str(),
+					  ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 			}
 			ServerInstance->XLines->ApplyLines();
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0]);
+			delete ql;
+			user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick.c_str(),parameters[0].c_str());
 		}
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelQLine(parameters[0]))
+		if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "Q", user))
 		{
-			FOREACH_MOD(I_OnDelQLine,OnDelQLine(user, parameters[0]));
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick.c_str(),parameters[0].c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick.c_str(),parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 	}