Introduce Server class

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

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 4e630e5dedef855fe73e4f7be7aca9e6095384df..2c5997558a4346b307827e5b1e9c9b80e389d2cc 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | 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) 2009 Matt Smith <dz@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"
 /** Handle /ZLINE. These command handlers can be reloaded by the core,
@@ -41,13 +49,13 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
        {
                if (target.find('!') != std::string::npos)
                {
-                       user->WriteServ("NOTICE %s :*** You cannot include a nickname in a zline, a zline must ban only an IP mask",user->nick.c_str());
+                       user->WriteNotice("*** You cannot include a nickname in a zline, a zline must ban only an IP mask");
                        return CMD_FAILURE;
                }
 
-               User *u = ServerInstance->FindNick(target.c_str());
+               User *u = ServerInstance->FindNick(target);
 
-               if (u)
+               if ((u) && (u->registered == REG_ALL))
                {
                        target = u->GetIPString();
                }
@@ -64,8 +72,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
                if (ServerInstance->IPMatchesEveryone(ipaddr,user))
                        return CMD_FAILURE;
 
-               long duration = ServerInstance->Duration(parameters[1].c_str());
-
+               unsigned long duration = InspIRCd::Duration(parameters[1]);
                ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
                if (ServerInstance->XLines->AddLine(zl,user))
                {
@@ -76,15 +83,16 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
+                               std::string timestr = InspIRCd::TimeString(c_requires_crap);
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr,
-                                               ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+                                               timestr.c_str(), parameters[2].c_str());
                        }
                        ServerInstance->XLines->ApplyLines();
                }
                else
                {
                        delete zl;
-                       user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick.c_str(),ipaddr);
+                       user->WriteNotice("*** Z-Line for " + std::string(ipaddr) + " already exists");
                }
        }
        else
@@ -95,7 +103,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick.c_str(),target.c_str());
+                       user->WriteNotice("*** Z-Line " + target + " not found in list, try /stats Z.");
                        return CMD_FAILURE;
                }
        }