X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_gline.cpp;h=bdb5c26b2bd3aff0585fd7acfd5c14d1b6db716d;hb=882084defcc43c876ecb10e30086b63ac074fcad;hp=430256be8f52d9644db02a3cfd734cb0991892b0;hpb=02859be56d43bcece02aab350e02bc95ed1bf446;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 430256be8..bdb5c26b2 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -51,19 +51,19 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 	if (parameters.size() >= 3)
 	{
 		IdentHostPair ih;
-		User* find = ServerInstance->FindNick(target.c_str());
-		if (find)
+		User* find = ServerInstance->FindNick(target);
+		if ((find) && (find->registered == REG_ALL))
 		{
 			ih.first = "*";
 			ih.second = find->GetIPString();
 			target = std::string("*@") + find->GetIPString();
 		}
 		else
-			ih = ServerInstance->XLines->IdentSplit(target.c_str());
+			ih = ServerInstance->XLines->IdentSplit(target);
 
 		if (ih.first.empty())
 		{
-			user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
+			user->WriteNotice("*** Target not found");
 			return CMD_FAILURE;
 		}
 
@@ -72,11 +72,11 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 
 		else if (target.find('!') != std::string::npos)
 		{
-			user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick.c_str());
+			user->WriteNotice("*** G-Line cannot operate on nick!user@host masks");
 			return CMD_FAILURE;
 		}
 
-		long duration = ServerInstance->Duration(parameters[1].c_str());
+		unsigned long duration = InspIRCd::Duration(parameters[1]);
 		GLine* gl = new GLine(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))
 		{
@@ -97,7 +97,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 		else
 		{
 			delete gl;
-			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick.c_str(),target.c_str());
+			user->WriteNotice("** G-Line for " + target + " already exists");
 		}
 
 	}
@@ -109,7 +109,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick.c_str(),target.c_str());
+			user->WriteNotice("*** G-Line " + target + " not found in list, try /stats g.");
 		}
 	}