X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_gline.cpp;h=351e230950def69312bd2df628d73e2ff7603900;hb=b0546ed55e040330dd28a856d6fab2e55863dd1f;hp=04b79a8cd7b80f76710fdfeb94a85b65a26f0ca4;hpb=8782cde20b474cf50f11fc6685c70a785bb3b2be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 04b79a8cd..351e23095 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -2,11 +2,11 @@
  *       | 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
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -22,59 +22,71 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /GLINE
  */
-CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (pcnt >= 3)
+	std::string target = parameters[0];
+		
+	if (parameters.size() >= 3)
 	{
-		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
-		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
-			return CMD_FAILURE;
+		IdentHostPair ih;
+		User* find = ServerInstance->FindNick(target.c_str());
+		if (find)
+		{
+			ih.first = "*";
+			ih.second = find->GetIPString();
+			target = std::string("*@") + find->GetIPString();
+		}
+		else
+			ih = ServerInstance->XLines->IdentSplit(target.c_str());
 
-		if (!strchr(parameters[0],'@'))
-		{       
-			user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+		if (ih.first.empty())
+		{
+			user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
 			return CMD_FAILURE;
 		}
-		else if (strchr(parameters[0],'!'))
+
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
+			return CMD_FAILURE;
+
+		else if (target.find('!') != std::string::npos)
 		{
-			user->WriteServ("NOTICE %s :*** G-Line cannot contain a nickname!",user->nick);
+			user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick.c_str());
 			return CMD_FAILURE;
 		}
 
-		long duration = ServerInstance->Duration(parameters[1]);
-		if (ServerInstance->XLines->AddGLine(duration,user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1].c_str());
+		GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
+		if (ServerInstance->XLines->AddLine(gl, user))
 		{
-			FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration, user, parameters[2], parameters[0]));
-
 			if (!duration)
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s: %s",user->nick.c_str(),target.c_str(), parameters[2].c_str());
 			}
 			else
 			{
 				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->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
+						ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 			}
 
 			ServerInstance->XLines->ApplyLines();
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
+			delete gl;
+			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick.c_str(),target.c_str());
 		}
 
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],'G'))
+		if (ServerInstance->XLines->DelLine(target.c_str(),"G",user))
 		{
-			FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0]));
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick.c_str(),target.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick.c_str(),target.c_str());
 		}
 	}