X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=b8d4ac4df3682c8bb1d6c951575070fc0281a86e;hb=ea590a5d80741c3bc030cb0a2fcb3c59da4fd078;hp=e088c12daba9395d280a3ed0728654daa9cca83c;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index e088c12da..b8d4ac4df 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -22,8 +22,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */
-
 /** Handle /NICKLOCK
  */
 class CommandNicklock : public Command
@@ -35,29 +33,29 @@ class CommandNicklock : public Command
 	{
 		flags_needed = 'o';
 		syntax = "<oldnick> <newnick>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
 	{
 		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());
+			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
 			return CMD_FAILURE;
 		}
 
 		/* Do local sanity checks and bails */
 		if (IS_LOCAL(user))
 		{
-			if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+			if (!ServerInstance->IsNick(parameters[1]))
 			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+				user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
 				return CMD_FAILURE;
 			}
 
-			user->WriteServ("947 %s %s :Nickname now locked.", user->nick.c_str(), parameters[1].c_str());
+			user->WriteNumeric(947, "%s :Nickname now locked.", parameters[1].c_str());
 		}
 
 		/* If we made it this far, extend the user */
@@ -66,7 +64,7 @@ class CommandNicklock : public Command
 			locked.set(target, 1);
 
 			std::string oldnick = target->nick;
-			if (target->ForceNickChange(parameters[1].c_str()))
+			if (target->ForceNickChange(parameters[1]))
 				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+oldnick+" to "+parameters[1]);
 			else
 			{
@@ -98,7 +96,7 @@ class CommandNickunlock : public Command
 	{
 		flags_needed = 'o';
 		syntax = "<locked-nick>";
-		TRANSLATE2(TR_NICK, TR_END);
+		TRANSLATE1(TR_NICK);
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -107,7 +105,7 @@ class CommandNickunlock : public Command
 
 		if (!target)
 		{
-			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
 			return CMD_FAILURE;
 		}
 
@@ -139,7 +137,6 @@ class CommandNickunlock : public Command
 	}
 };
 
-
 class ModuleNickLock : public Module
 {
 	LocalIntExt locked;
@@ -148,33 +145,22 @@ class ModuleNickLock : public Module
  public:
 	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()
 	{
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		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)
+	ModResult OnUserPreNick(User* user, const std::string &newnick) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
-			return MOD_RES_PASSTHRU;
-
 		if (locked.get(user))
 		{
-			user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str());
+			user->WriteNumeric(ERR_CANTCHANGENICK, ":You cannot change your nickname (your nick is locked)");
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
@@ -183,7 +169,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);
 	}
 };