X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=df8a551dd2bd3b1ca2d29204f63d5b20f8204ba3;hb=1484a054870bdfe94346057053d5c8e48a708232;hp=f6a5749e41a7f8faf9a6a684c3863c3ee7d126ff;hpb=af3020ad8a49b25663d713863aef209a4d514291;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index f6a5749e4..df8a551dd 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,68 +14,91 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
 
 /* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */
 
-Server *Srv;
+static Server *Srv;
 
-char* dummy = "ON";
-	 
-void handle_nicklock(char **parameters, int pcnt, userrec *user)
+class cmd_nicklock : public command_t
 {
-	userrec* source = Srv->FindNick(std::string(parameters[0]));
-	if (source)
+	char* dummy;
+ public:
+	cmd_nicklock () : command_t("NICKLOCK", 'o', 2)
 	{
-		if (source->GetExt("nick_locked"))
-		{
-			WriteServ(user->fd,"946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
-			return;
-		}
-		if (Srv->IsNick(std::string(parameters[1])))
+		this->source = "m_nicklock.so";
+	}
+
+	void Handle(const char** parameters, int pcnt, userrec *user)
+	{
+		userrec* source = Srv->FindNick(std::string(parameters[0]));
+		irc::string server;
+		irc::string me;
+
+		if (source)
 		{
-			if (!strcasecmp(user->server,Srv->GetServerName().c_str()))
+			if (source->GetExt("nick_locked", dummy))
+			{
+				WriteServ(user->fd,"946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
+				return;
+			}
+			if (Srv->IsNick(std::string(parameters[1])))
 			{
 				// give them a lock flag
 				Srv->SendOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+std::string(parameters[0])+" to "+parameters[1]);
 				Srv->ChangeUserNick(source,std::string(parameters[1]));
 				// only attempt to set their lockflag after we know the change succeeded
-				userrec* s2 = Srv->FindNick(std::string(parameters[1]));
-				if (s2)
-					s2->Extend("nick_locked",dummy);
-			}
-			else
-			{
-				WriteServ(user->fd,"947 %s %s :Can't lock the nickname of a non-local user",user->nick,source->nick);
+				source = Srv->FindNick(std::string(parameters[1]));
+				if (source)
+					source->Extend("nick_locked", "ON");
 			}
 		}
 	}
-}
+};
 
-void handle_nickunlock(char **parameters, int pcnt, userrec *user)
+class cmd_nickunlock : public command_t
 {
-	userrec* source = Srv->FindNick(std::string(parameters[0]));
-	if (source)
+ public:
+	cmd_nickunlock () : command_t("NICKUNLOCK", 'o', 1)
 	{
-		source->Shrink("nick_locked");
-		WriteServ(user->fd,"945 %s %s :Nickname now unlocked.",user->nick,source->nick);
-		Srv->SendOpers(std::string(user->nick)+" used NICKUNLOCK on "+std::string(parameters[0]));
+		this->source = "m_nickunlock.so";
 	}
-}
+
+	void Handle (const char** parameters, int pcnt, userrec *user)
+	{
+		userrec* source = Srv->FindNick(std::string(parameters[0]));
+		if (source)
+		{
+			source->Shrink("nick_locked");
+			WriteServ(user->fd,"945 %s %s :Nickname now unlocked.",user->nick,source->nick);
+			Srv->SendOpers(std::string(user->nick)+" used NICKUNLOCK on "+std::string(parameters[0]));
+		}
+	}
+};
 
 
 class ModuleNickLock : public Module
 {
+	cmd_nicklock*	cmd1;
+	cmd_nickunlock*	cmd2;
+	char* n;
  public:
-	ModuleNickLock()
+	ModuleNickLock(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("NICKLOCK",handle_nicklock,'o',2,"m_nicklock.so");
-		Srv->AddCommand("NICKUNLOCK",handle_nickunlock,'o',1,"m_nicklock.so");
+		Srv = Me;
+		cmd1 = new cmd_nicklock();
+		cmd2 = new cmd_nickunlock();
+		Srv->AddCommand(cmd1);
+		Srv->AddCommand(cmd2);
 	}
 	
 	virtual ~ModuleNickLock()
@@ -87,9 +110,14 @@ class ModuleNickLock : public Module
 		return Version(1,0,0,1,VF_VENDOR);
 	}
 
-	virtual int OnUserPreNick(userrec* user, std::string newnick)
+	void Implements(char* List)
 	{
-		if (user->GetExt("nick_locked"))
+		List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
+	}
+
+	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+	{
+		if (user->GetExt("nick_locked", n))
 		{
 			WriteServ(user->fd,"447 %s :You cannot change your nickname (your nick is locked)",user->nick);
 			return 1;
@@ -97,11 +125,19 @@ class ModuleNickLock : public Module
 		return 0;
 	}
 
-        virtual void OnUserQuit(userrec* user)
-        {
-                user->Shrink("nick_locked");
-        }
+	virtual void OnUserQuit(userrec* user, const std::string &reason)
+	{
+		user->Shrink("nick_locked");
+	}
 
+	virtual void OnCleanup(int target_type, void* item)
+	{
+		if(target_type == TYPE_USER)
+		{
+			userrec* user = (userrec*)item;
+			user->Shrink("nick_locked");
+		}
+	}
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.
@@ -117,9 +153,9 @@ class ModuleNickLockFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleNickLock;
+		return new ModuleNickLock(Me);
 	}
 	
 };