X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=86cf6245a75402b1b2d7865c54cce3a46681c33e;hb=d57cad7896a4e9f78565d998e3fbd98b0b32c94e;hp=6e22a69bbb7cd559550701ddcbc5ac92685b22d9;hpb=d1df2bce56275e1297d94d82d4dbef6f6cf582b6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 6e22a69bb..86cf6245a 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -22,6 +22,14 @@
 
 #include "inspircd.h"
 
+enum
+{
+	// InspIRCd-specific.
+	ERR_NICKNOTLOCKED = 946,
+	RPL_NICKLOCKON = 947,
+	RPL_NICKLOCKOFF = 945
+};
+
 /** Handle /NICKLOCK
  */
 class CommandNicklock : public Command
@@ -32,11 +40,11 @@ class CommandNicklock : public Command
 		locked(ext)
 	{
 		flags_needed = 'o';
-		syntax = "<oldnick> <newnick>";
+		syntax = "<nick> <newnick>";
 		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
 
@@ -55,7 +63,7 @@ class CommandNicklock : public Command
 				return CMD_FAILURE;
 			}
 
-			user->WriteNumeric(947, parameters[1], "Nickname now locked.");
+			user->WriteNumeric(RPL_NICKLOCKON, parameters[1], "Nickname now locked.");
 		}
 
 		/* If we made it this far, extend the user */
@@ -76,7 +84,7 @@ class CommandNicklock : public Command
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_OPT_UCAST(parameters[0]);
 	}
@@ -92,11 +100,11 @@ class CommandNickunlock : public Command
 		locked(ext)
 	{
 		flags_needed = 'o';
-		syntax = "<locked-nick>";
+		syntax = "<nick>";
 		TRANSLATE1(TR_NICK);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
 
@@ -111,11 +119,11 @@ class CommandNickunlock : public Command
 			if (locked.set(target, 0))
 			{
 				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKUNLOCK on "+target->nick);
-				user->WriteRemoteNumeric(945, target->nick, "Nickname now unlocked.");
+				user->WriteRemoteNumeric(RPL_NICKLOCKOFF, target->nick, "Nickname now unlocked.");
 			}
 			else
 			{
-				user->WriteRemoteNumeric(946, target->nick, "This user's nickname is not locked.");
+				user->WriteRemoteNumeric(ERR_NICKNOTLOCKED, target->nick, "This user's nickname is not locked.");
 				return CMD_FAILURE;
 			}
 		}
@@ -123,7 +131,7 @@ class CommandNickunlock : public Command
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_OPT_UCAST(parameters[0]);
 	}