X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=26d5bfbd7f1c1c6f55d0f95c37de059bfe83fa88;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=5b7e78faffcd06361444c2c07616f80f60293c43;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 5b7e78faf..26d5bfbd7 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -11,18 +11,14 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "hashcomp.h"
-#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 cmd_nicklock : public command_t
@@ -41,31 +37,40 @@ class cmd_nicklock : public command_t
 		irc::string server;
 		irc::string me;
 
-		if (source)
+		// check user exists
+		if (!source)
 		{
-			if (source->GetExt("nick_locked", dummy))
-			{
-				user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
-				return CMD_FAILURE;
-			}
-			if (ServerInstance->IsNick(parameters[1]))
-			{
-				// give them a lock flag
-				ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
-				if (!source->ForceNickChange(parameters[1]))
-				{
-					userrec::QuitUser(ServerInstance, source, "Nickname collision");
-					return CMD_FAILURE;
-				}
-				source->Extend("nick_locked", "ON");
-
-				return CMD_SUCCESS;
-			}
+			return CMD_FAILURE;
+		}
 
+		// check if user is locked
+		if (source->GetExt("nick_locked", dummy))
+		{
+			user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
 			return CMD_FAILURE;
 		}
 
-		return CMD_FAILURE;
+		// check nick is valid
+		if (!ServerInstance->IsNick(parameters[1]))
+		{
+			return CMD_FAILURE;
+		}
+
+		// let others know
+		ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
+
+		if (!source->ForceNickChange(parameters[1]))
+		{
+			// ugh, nickchange failed for some reason -- possibly existing nick?
+			userrec::QuitUser(ServerInstance, source, "Nickname collision");
+			return CMD_FAILURE;
+		}
+
+		// give them a lock flag
+		source->Extend("nick_locked", "ON");
+
+		/* route */
+		return CMD_SUCCESS;
 	}
 };
 
@@ -103,7 +108,7 @@ class ModuleNickLock : public Module
 	char* n;
  public:
 	ModuleNickLock(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		cmd1 = new cmd_nicklock(ServerInstance);
@@ -136,7 +141,7 @@ class ModuleNickLock : public Module
 		return 0;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason)
+	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
 	{
 		user->Shrink("nick_locked");
 	}
@@ -151,29 +156,4 @@ class ModuleNickLock : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleNickLockFactory : public ModuleFactory
-{
- public:
-	ModuleNickLockFactory()
-	{
-	}
-	
-	~ModuleNickLockFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNickLock(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNickLockFactory;
-}
-
+MODULE_INIT(ModuleNickLock)