X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=5e994e3fdcfe2d8bcb782fd0f7ac66260ab9b9c9;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=c2c02f6292fab7562534de769969dbd8b0643f94;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index c2c02f629..5e994e3fd 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-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,11 +17,11 @@
 
 /** Handle /NICKLOCK
  */
-class cmd_nicklock : public Command
+class CommandNicklock : public Command
 {
 	char* dummy;
  public:
-	cmd_nicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
+	CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
@@ -54,7 +54,7 @@ class cmd_nicklock : public Command
 		}
 
 		// 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]))
 		{
@@ -72,10 +72,10 @@ class cmd_nicklock : public Command
 
 /** Handle /NICKUNLOCK
  */
-class cmd_nickunlock : public Command
+class CommandNickunlock : public Command
 {
  public:
-	cmd_nickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
+	CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
@@ -88,7 +88,7 @@ class cmd_nickunlock : public Command
 		{
 			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]);
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
 			return CMD_SUCCESS;
 		}
 
@@ -99,18 +99,20 @@ class cmd_nickunlock : public Command
 
 class ModuleNickLock : public Module
 {
-	cmd_nicklock*	cmd1;
-	cmd_nickunlock*	cmd2;
+	CommandNicklock*	cmd1;
+	CommandNickunlock*	cmd2;
 	char* n;
  public:
 	ModuleNickLock(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		cmd1 = new cmd_nicklock(ServerInstance);
-		cmd2 = new cmd_nickunlock(ServerInstance);
+		cmd1 = new CommandNicklock(ServerInstance);
+		cmd2 = new CommandNickunlock(ServerInstance);
 		ServerInstance->AddCommand(cmd1);
 		ServerInstance->AddCommand(cmd2);
+		Implementation eventlist[] = { I_OnUserPreNick, I_OnUserQuit, I_OnCleanup };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 	
 	virtual ~ModuleNickLock()
@@ -122,10 +124,6 @@ class ModuleNickLock : public Module
 		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
-	}
 
 	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{