Increase penalty for KNOCK

[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 ddfc4745597257c61ed7a5bf04a77ad5f942ef70..dd65a5a74e2e587141706f0c416d587fa2db6aaf 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,9 +21,10 @@ class CommandNicklock : public Command
 {
  public:
        LocalIntExt& locked;
-       CommandNicklock (Module* Creator, LocalIntExt& ext) : Command(Creator->ServerInstance, Creator,"NICKLOCK", "o", 2),
+       CommandNicklock (Module* Creator, LocalIntExt& ext) : Command(Creator,"NICKLOCK", 2),
                locked(ext)
        {
+               flags_needed = 'o';
                syntax = "<oldnick> <newnick>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
@@ -89,9 +90,10 @@ class CommandNickunlock : public Command
 {
  public:
        LocalIntExt& locked;
-       CommandNickunlock (Module* Creator, LocalIntExt& ext) : Command(Creator->ServerInstance, Creator,"NICKUNLOCK", "o", 1),
+       CommandNickunlock (Module* Creator, LocalIntExt& ext) : Command(Creator,"NICKUNLOCK", 1),
                locked(ext)
        {
+               flags_needed = 'o';
                syntax = "<locked-nick>";
                TRANSLATE2(TR_NICK, TR_END);
        }
@@ -149,12 +151,12 @@ class ModuleNickLock : public Module
        CommandNicklock cmd1;
        CommandNickunlock cmd2;
  public:
-       ModuleNickLock(InspIRCd* Me)
-               : Module(Me), locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked)
+       ModuleNickLock()
+               : locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked)
        {
                ServerInstance->AddCommand(&cmd1);
                ServerInstance->AddCommand(&cmd2);
-               Extensible::Register(&locked);
+               ServerInstance->Extensions.Register(&locked);
                ServerInstance->Modules->Attach(I_OnUserPreNick, this);
        }
 
@@ -164,7 +166,7 @@ class ModuleNickLock : public Module
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR);
        }
 
 
@@ -173,10 +175,7 @@ class ModuleNickLock : public Module
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               if (isdigit(newnick[0])) /* Allow a switch to a UID */
-                       return MOD_RES_PASSTHRU;
-
-               if (User::NICKForced.get(user)) /* Allow forced nick changes */
+               if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
                        return MOD_RES_PASSTHRU;
 
                if (locked.get(user))