X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_kline.cpp;h=ce3642f91a70f8be66f7bd6a09c7e8357e7fe7b3;hb=8365be5414ae0f6d09724bd540db41ba24b2a7fd;hp=4c11765b20880adeaf3d2c03af31a002db6351e9;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 4c11765b2..ce3642f91 100644
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
@@ -44,15 +51,15 @@ CmdResult CommandKline::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())
         {
@@ -80,8 +87,9 @@ CmdResult CommandKline::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 K-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());
 			}
 
 			ServerInstance->XLines->ApplyLines();