Fix potential for duplicate SID if the SID is auto generated.

[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 dd51be1ccc98f21dc5e483daaed3425b1a0e8096..731c0433dd165012c5889a423891e323e8ef1bc6 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -11,28 +11,21 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.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 */
 
-
 /** Handle /NICKLOCK
  */
 class cmd_nicklock : public command_t
 {
        char* dummy;
  public:
- cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
+       cmd_nicklock (InspIRCd* Instance) : command_t(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)
@@ -67,7 +60,6 @@ class cmd_nicklock : public command_t
                {
                        // ugh, nickchange failed for some reason -- possibly existing nick?
                        userrec::QuitUser(ServerInstance, source, "Nickname collision");
-                       return CMD_FAILURE;
                }
 
                // give them a lock flag
@@ -83,9 +75,9 @@ class cmd_nicklock : public command_t
 class cmd_nickunlock : public command_t
 {
  public:
- cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"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>";
        }
 
@@ -112,7 +104,7 @@ class ModuleNickLock : public Module
        char* n;
  public:
        ModuleNickLock(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                cmd1 = new cmd_nicklock(ServerInstance);
@@ -127,7 +119,7 @@ class ModuleNickLock : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        void Implements(char* List)
@@ -137,6 +129,9 @@ class ModuleNickLock : public Module
 
        virtual int OnUserPreNick(userrec* user, const std::string &newnick)
        {
+               if (isdigit(newnick[0])) /* allow a switch to a UID */
+                       return 0;
+
                if (user->GetExt("nick_locked", n))
                {
                        user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick);
@@ -160,29 +155,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)