X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_eline.cpp;h=67f67e9f09cdd79beb0c938454fb0e235e3e9dc2;hb=6db924458501457768d7ddafd5de8a69839f6399;hp=15487bd8e984d73356c77a19df183db20cd4c5b1;hpb=7998173bcebb06e5e43e3337cc029eba3389199f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 15487bd8e..67f67e9f0 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -50,27 +50,26 @@ CmdResult CommandEline::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());
-            return CMD_FAILURE;
-        }
+		if (ih.first.empty())
+		{
+			user->WriteNotice("*** Target not found");
+			return CMD_FAILURE;
+		}
 
 		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
-		long duration = ServerInstance->Duration(parameters[1].c_str());
-
+		unsigned long duration = InspIRCd::Duration(parameters[1]);
 		ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
 		if (ServerInstance->XLines->AddLine(el, user))
 		{
@@ -81,14 +80,15 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
+				std::string timestr = ServerInstance->TimeString(c_requires_crap);
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-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());
+						timestr.c_str(), parameters[2].c_str());
 			}
 		}
 		else
 		{
 			delete el;
-			user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick.c_str(),target.c_str());
+			user->WriteNotice("*** E-Line for " + target + " already exists");
 		}
 	}
 	else
@@ -99,7 +99,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick.c_str(),target.c_str());
+			user->WriteNotice("*** E-Line " + target + " not found in list, try /stats e");
 		}
 	}