X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=40965ffe007aa0824eac30fd634827d0415c06db;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=9dc1bca69f84a01038c15726aa190afdd109ed84;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 9dc1bca69..40965ffe0 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,49 +21,53 @@ 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 std::vector<std::string>& parameters, 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.c_str(),target->nick.c_str());
 			return CMD_FAILURE;
 		}
 
 		// check nick is valid
-		if (!ServerInstance->IsNick(parameters[1]))
+		if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
 		{
 			return CMD_FAILURE;
 		}
 
 		// let others know
-		ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
+		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].c_str()))
 		{
 			// ugh, nickchange failed for some reason -- possibly existing nick?
-			User::QuitUser(ServerInstance, source, "Nickname collision");
+			if (!target->ForceNickChange(target->uuid.c_str()))
+			{
+				// Well shit, we cant even change them to their UID (this should not happen!)
+				ServerInstance->Users->QuitUser(target, "Nickname collision");
+			}
 		}
 
 		// give them a lock flag
-		source->Extend("nick_locked", "ON");
+		target->Extend("nick_locked", "ON");
 
 		/* route */
 		return CMD_SUCCESS;
@@ -75,20 +79,20 @@ 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 std::vector<std::string>& parameters, 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);
-			ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
+			target->Shrink("nick_locked");
+			user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str());
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
 			return CMD_SUCCESS;
 		}
 
@@ -106,7 +110,7 @@ class ModuleNickLock : public Module
 	ModuleNickLock(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		cmd1 = new CommandNicklock(ServerInstance);
 		cmd2 = new CommandNickunlock(ServerInstance);
 		ServerInstance->AddCommand(cmd1);
@@ -114,14 +118,14 @@ class ModuleNickLock : public Module
 		Implementation eventlist[] = { I_OnUserPreNick, I_OnUserQuit, I_OnCleanup };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
+
 	virtual ~ModuleNickLock()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
@@ -132,7 +136,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.c_str());
 			return 1;
 		}
 		return 0;