m_check Fix non-standard format specifier %s passed to strftime() causing problems...

[user/henk/code/inspircd.git] / src / commands / cmd_gline.cpp

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index cc29954d5153dd772f185747851d937ac6cfac8d..6505b7464615804ad272018e1e883eab12fa557b 100644 (file)
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 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 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())
                {
@@ -70,7 +77,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
                }
 
                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());
+               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))
                {
                        if (!duration)
@@ -80,8 +87,9 @@ CmdResult CommandGline::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 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());
+                                               timestr.c_str(), parameters[2].c_str());
                        }
 
                        ServerInstance->XLines->ApplyLines();
@@ -97,7 +105,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
        {
                if (ServerInstance->XLines->DelLine(target.c_str(),"G",user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick.c_str(),target.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed G-line on %s",user->nick.c_str(),target.c_str());
                }
                else
                {