X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=090481d06e8050cf74fd8eadc329c4453022dd74;hb=89fc6ca9c66198fe54cce19d59279cd454fc1bd0;hp=5e994e3fdcfe2d8bcb782fd0f7ac66260ab9b9c9;hpb=4426a2fc448f332e42a7e6ff778e5047bb588c98;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 5e994e3fd..090481d06 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -21,29 +21,29 @@ class CommandNicklock : public Command
 {
 	char* dummy;
  public:
-	CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
+	CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", "o", 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, User *user)
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user)
 	{
-		User* source = ServerInstance->FindNick(parameters[0]);
+		User* target = ServerInstance->FindNick(parameters[0]);
 		irc::string server;
 		irc::string me;
 
 		// check user exists
-		if (!source)
+		if (!target)
 		{
 			return CMD_FAILURE;
 		}
 
 		// check if user is locked
-		if (source->GetExt("nick_locked", dummy))
+		if (target->GetExt("nick_locked", dummy))
 		{
-			user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
+			user->WriteNumeric(946, "%s %s :This user's nickname is already locked.",user->nick,target->nick);
 			return CMD_FAILURE;
 		}
 
@@ -56,14 +56,14 @@ class CommandNicklock : public Command
 		// let others know
 		ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
 
-		if (!source->ForceNickChange(parameters[1]))
+		if (!target->ForceNickChange(parameters[1]))
 		{
 			// ugh, nickchange failed for some reason -- possibly existing nick?
-			User::QuitUser(ServerInstance, source, "Nickname collision");
+			User::QuitUser(ServerInstance, target, "Nickname collision");
 		}
 
 		// give them a lock flag
-		source->Extend("nick_locked", "ON");
+		target->Extend("nick_locked", "ON");
 
 		/* route */
 		return CMD_SUCCESS;
@@ -75,19 +75,19 @@ class CommandNicklock : public Command
 class CommandNickunlock : public Command
 {
  public:
-	CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
+	CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", "o", 1)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
-		User* source = ServerInstance->FindNick(parameters[0]);
-		if (source)
+		User* target = ServerInstance->FindNick(parameters[0]);
+		if (target)
 		{
-			source->Shrink("nick_locked");
-			user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick);
+			target->Shrink("nick_locked");
+			user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick,target->nick);
 			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
 			return CMD_SUCCESS;
 		}
@@ -121,7 +121,7 @@ class ModuleNickLock : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
@@ -132,7 +132,7 @@ class ModuleNickLock : public Module
 
 		if (user->GetExt("nick_locked", n))
 		{
-			user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick);
+			user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick);
 			return 1;
 		}
 		return 0;