Fix m_chanlog crashing.

[user/henk/code/inspircd.git] / src / modules / m_nicklock.cpp

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index e21ea9b90c773ac7271c959e0c1e2d78c6c2bbf8..5e994e3fdcfe2d8bcb782fd0f7ac66260ab9b9c9 100644 (file)
--- 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,20 +17,20 @@
 
 /** 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>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, User *user)
        {
-               userrec* source = ServerInstance->FindNick(parameters[0]);
+               User* source = ServerInstance->FindNick(parameters[0]);
                irc::string server;
                irc::string me;
 
@@ -54,12 +54,12 @@ 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]))
                {
                        // ugh, nickchange failed for some reason -- possibly existing nick?
-                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
+                       User::QuitUser(ServerInstance, source, "Nickname collision");
                }
 
                // give them a lock flag
@@ -72,23 +72,23 @@ 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>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               userrec* source = ServerInstance->FindNick(parameters[0]);
+               User* source = ServerInstance->FindNick(parameters[0]);
                if (source)
                {
                        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,12 +124,8 @@ 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(userrec* user, const std::string &newnick)
+       virtual int OnUserPreNick(User* user, const std::string &newnick)
        {
                if (isdigit(newnick[0])) /* allow a switch to a UID */
                        return 0;
@@ -140,7 +138,7 @@ class ModuleNickLock : public Module
                return 0;
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+       virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
        {
                user->Shrink("nick_locked");
        }
@@ -149,7 +147,7 @@ class ModuleNickLock : public Module
        {
                if(target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
                        user->Shrink("nick_locked");
                }
        }