Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / modules / m_sanick.cpp

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index cd3c0aff84620a315b24c6ba9a4d3201541268b1..4e4be77ae635c6e7f6d73d452dee4c6e88057e81 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.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) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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"
 
 /* $ModDesc: Provides support for SANICK command */
@@ -22,6 +30,7 @@ class CommandSanick : public Command
  public:
        CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o'; Penalty = 0; syntax = "<nick> <new-nick>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
@@ -39,7 +48,7 @@ class CommandSanick : public Command
                                return CMD_FAILURE;
                        }
 
-                       if (!target)
+                       if ((!target) || (target->registered != REG_ALL))
                        {
                                user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
                                return CMD_FAILURE;
@@ -57,15 +66,13 @@ class CommandSanick : public Command
                {
                        std::string oldnick = user->nick;
                        std::string newnick = target->nick;
-                       if (target->ForceNickChange(parameters[1].c_str()))
+                       if (target->ChangeNick(parameters[1], true))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
-                               ServerInstance->PI->SendSNONotice("A", oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
+                               ServerInstance->SNO->WriteGlobalSno('a', oldnick+" used SANICK to change "+newnick+" to "+parameters[1]);
                        }
                        else
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
-                               ServerInstance->PI->SendSNONotice("A", oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
+                               ServerInstance->SNO->WriteGlobalSno('a', oldnick+" failed SANICK (from "+newnick+" to "+parameters[1]+")");
                        }
                }
 
@@ -86,10 +93,14 @@ class ModuleSanick : public Module
 {
        CommandSanick cmd;
  public:
-       ModuleSanick(InspIRCd* Me)
-               : Module(Me), cmd(this)
+       ModuleSanick()
+               : cmd(this)
+       {
+       }
+
+       void init()
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual ~ModuleSanick()
@@ -98,7 +109,7 @@ class ModuleSanick : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
        }
 
 };