m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index dd65a5a74e2e587141706f0c416d587fa2db6aaf..892702f02b44a2431fe6dfff247587f439699c10 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -1,19 +1,28 @@
-/*       +------------------------------------+
- *       | 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-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2006 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 the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */
+/* $ModDesc: Provides the NICKLOCK command, allows an oper to change a users nick and lock them to it until they quit */
 
 /** Handle /NICKLOCK
  */
@@ -33,22 +42,16 @@ class CommandNicklock : public Command
        {
                User* target = ServerInstance->FindNick(parameters[0]);
 
+               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;
+               }
+
                /* Do local sanity checks and bails */
                if (IS_LOCAL(user))
                {
-                       if (target && ServerInstance->ULine(target->server))
-                       {
-                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKLOCK command on a u-lined client",user->nick.c_str());
-                               return CMD_FAILURE;
-                       }
-
-                       if (!target)
-                       {
-                               user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
-                               return CMD_FAILURE;
-                       }
-
-                       if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+                       if (!ServerInstance->IsNick(parameters[1], ServerInstance->Config->Limits.NickMax))
                        {
                                user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
                                return CMD_FAILURE;
@@ -58,7 +61,7 @@ class CommandNicklock : public Command
                }
 
                /* If we made it this far, extend the user */
-               if (target && IS_LOCAL(target))
+               if (IS_LOCAL(target))
                {
                        locked.set(target, 1);
 
@@ -102,32 +105,24 @@ class CommandNickunlock : public Command
        {
                User* target = ServerInstance->FindNick(parameters[0]);
 
-               /* Do local sanity checks and bails */
-               if (IS_LOCAL(user))
+               if (!target)
                {
-                       if (target && ServerInstance->ULine(target->server))
-                       {
-                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKUNLOCK command on a u-lined client",user->nick.c_str());
-                               return CMD_FAILURE;
-                       }
-
-                       if (!target)
-                       {
-                               user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
-                               return CMD_FAILURE;
-                       }
+                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+                       return CMD_FAILURE;
                }
 
-               if (target && IS_LOCAL(target))
+               if (IS_LOCAL(target))
                {
                        if (locked.set(target, 0))
                        {
-                               ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
-                               user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKUNLOCK on "+target->nick);
+                               user->SendText(":%s 945 %s %s :Nickname now unlocked.",
+                                       ServerInstance->Config->ServerName.c_str(),user->nick.c_str(),target->nick.c_str());
                        }
                        else
                        {
-                               user->WriteNumeric(946, "%s %s :This user's nickname is not locked.",user->nick.c_str(),target->nick.c_str());
+                               user->SendText(":%s 946 %s %s :This user's nickname is not locked.",
+                                       ServerInstance->Config->ServerName.c_str(),user->nick.c_str(),target->nick.c_str());
                                return CMD_FAILURE;
                        }
                }
@@ -144,7 +139,6 @@ class CommandNickunlock : public Command
        }
 };
 
-
 class ModuleNickLock : public Module
 {
        LocalIntExt locked;
@@ -154,22 +148,21 @@ class ModuleNickLock : public Module
        ModuleNickLock()
                : locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked)
        {
-               ServerInstance->AddCommand(&cmd1);
-               ServerInstance->AddCommand(&cmd2);
-               ServerInstance->Extensions.Register(&locked);
-               ServerInstance->Modules->Attach(I_OnUserPreNick, this);
        }
 
-       ~ModuleNickLock()
+       void init()
        {
+               ServerInstance->Modules->AddService(cmd1);
+               ServerInstance->Modules->AddService(cmd2);
+               ServerInstance->Modules->AddService(locked);
+               ServerInstance->Modules->Attach(I_OnUserPreNick, this);
        }
 
        Version GetVersion()
        {
-               return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the NICKLOCK command, allows an oper to change a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR);
        }
 
-
        ModResult OnUserPreNick(User* user, const std::string &newnick)
        {
                if (!IS_LOCAL(user))