Move SetNoticeMask(), FormatNoticeMasks() and ProcessNoticeMasks() from the User...

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

diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp
index ffe8c5ee62ec9c43afbf02c1bd45d78cbdec9468..bfc9e451948aa2841f92a7403743f1fef9f3dd68 100644 (file)
--- a/src/commands/cmd_qline.cpp
+++ b/src/commands/cmd_qline.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | 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) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 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"
 
@@ -40,12 +48,12 @@ CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User
 
                if (parameters[0].find('@') != std::string::npos || parameters[0].find('!') != std::string::npos || parameters[0].find('.') != std::string::npos)
                {
-                       user->WriteServ("NOTICE %s :*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.",user->nick.c_str());
+                       user->WriteNotice("*** A Q-Line only bans a nick pattern, not a nick!user@host pattern.");
                        return CMD_FAILURE;
                }
 
-               long duration = ServerInstance->Duration(parameters[1].c_str());
-               QLine* ql = new QLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
+               unsigned long duration = InspIRCd::Duration(parameters[1]);
+               QLine* ql = new QLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
                if (ServerInstance->XLines->AddLine(ql,user))
                {
                        if (!duration)
@@ -55,15 +63,16 @@ CmdResult CommandQline::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 Q-line for %s, expires on %s: %s",user->nick.c_str(),parameters[0].c_str(),
-                                         ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+                                               timestr.c_str(), parameters[2].c_str());
                        }
                        ServerInstance->XLines->ApplyLines();
                }
                else
                {
                        delete ql;
-                       user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick.c_str(),parameters[0].c_str());
+                       user->WriteNotice("*** Q-Line for " + parameters[0] + " already exists");
                }
        }
        else
@@ -74,7 +83,7 @@ CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Q-Line %s not found in list, try /stats q.",user->nick.c_str(),parameters[0].c_str());
+                       user->WriteNotice("*** Q-Line " + parameters[0] + " not found in list, try /stats q.");
                        return CMD_FAILURE;
                }
        }