X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=8c81fd4c304ed2b1119d9740e16400e3d857dcc6;hb=bb35a0fa9cbebe51fa636f707c12ca4a7033dd9a;hp=2f80e0d51b7537e9212a32a0c3c4ef24aea3cfb2;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 2f80e0d51..8c81fd4c3 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -2,81 +2,90 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.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 */
 
-extern InspIRCd* ServerInstance;
-
+/** Handle /NICKLOCK
+ */
 class cmd_nicklock : public command_t
 {
 	char* dummy;
  public:
-	cmd_nicklock () : command_t("NICKLOCK", 'o', 2)
+	cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
 		userrec* source = ServerInstance->FindNick(parameters[0]);
 		irc::string server;
 		irc::string me;
 
-		if (source)
+		// check user exists
+		if (!source)
+		{
+			return CMD_FAILURE;
+		}
+
+		// check if user is locked
+		if (source->GetExt("nick_locked", dummy))
 		{
-			if (source->GetExt("nick_locked", dummy))
-			{
-				user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
-				return;
-			}
-			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;
-				}
-				source->Extend("nick_locked", "ON");
-			}
+			user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
+			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;
 	}
 };
 
+/** Handle /NICKUNLOCK
+ */
 class cmd_nickunlock : public command_t
 {
  public:
-	cmd_nickunlock () : command_t("NICKUNLOCK", 'o', 1)
+	cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
 	{
-		this->source = "m_nickunlock.so";
+		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		userrec* source = ServerInstance->FindNick(parameters[0]);
 		if (source)
@@ -84,7 +93,10 @@ class cmd_nickunlock : public command_t
 			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]);
+			return CMD_SUCCESS;
 		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -96,11 +108,11 @@ class ModuleNickLock : public Module
 	char* n;
  public:
 	ModuleNickLock(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
-		cmd1 = new cmd_nicklock();
-		cmd2 = new cmd_nickunlock();
+		cmd1 = new cmd_nicklock(ServerInstance);
+		cmd2 = new cmd_nickunlock(ServerInstance);
 		ServerInstance->AddCommand(cmd1);
 		ServerInstance->AddCommand(cmd2);
 	}
@@ -111,7 +123,7 @@ class ModuleNickLock : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
@@ -129,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");
 	}
@@ -144,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)