X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=4f5e5941cea5d653bb2453e19e154b4fcb68d82b;hb=402a1bb010522a35600325c1a3084e092b40ca22;hp=0ba90e9847ca3e54818fd0022e53d912b4f1f53f;hpb=d560adec9e578c40f786a0849e3a15f99e738b56;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 0ba90e984..4f5e5941c 100644
--- 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,7 +42,7 @@ class CommandNicklock : public Command
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
 
-		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;
@@ -140,9 +149,13 @@ 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);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd1);
+		ServerInstance->Modules->AddService(cmd2);
+		ServerInstance->Modules->AddService(locked);
 		ServerInstance->Modules->Attach(I_OnUserPreNick, this);
 	}
 
@@ -152,7 +165,7 @@ class ModuleNickLock : public Module
 
 	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)
@@ -174,7 +187,7 @@ class ModuleNickLock : public Module
 	void Prioritize()
 	{
 		Module *nflood = ServerInstance->Modules->Find("m_nickflood.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &nflood);
+		ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, &nflood);
 	}
 };