Remove debug stuff

[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..6f2e94cd4033e596358e373de3e0d70774c34169 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -11,33 +11,26 @@
  * ---------------------------------------------------
  */
 
-#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
+class CommandNicklock : public Command
 {
        char* dummy;
  public:
- cmd_nicklock (InspIRCd* Instance) : command_t(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;
 
@@ -66,8 +59,7 @@ class cmd_nicklock : public command_t
                if (!source->ForceNickChange(parameters[1]))
                {
                        // ugh, nickchange failed for some reason -- possibly existing nick?
-                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
-                       return CMD_FAILURE;
+                       User::QuitUser(ServerInstance, source, "Nickname collision");
                }
 
                // give them a lock flag
@@ -80,18 +72,18 @@ class cmd_nicklock : public command_t
 
 /** Handle /NICKUNLOCK
  */
-class cmd_nickunlock : public command_t
+class CommandNickunlock : public Command
 {
  public:
- cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
+       CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
        {
-               this->source = "m_nickunlock.so";
+               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");
@@ -107,16 +99,16 @@ class cmd_nickunlock : public command_t
 
 class ModuleNickLock : public Module
 {
-       cmd_nicklock*   cmd1;
-       cmd_nickunlock* cmd2;
+       CommandNicklock*        cmd1;
+       CommandNickunlock*      cmd2;
        char* n;
  public:
        ModuleNickLock(InspIRCd* Me)
-               : Module::Module(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);
        }
@@ -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)
@@ -135,8 +127,11 @@ class ModuleNickLock : public Module
                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;
+
                if (user->GetExt("nick_locked", n))
                {
                        user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick);
@@ -145,7 +140,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");
        }
@@ -154,35 +149,10 @@ class ModuleNickLock : public Module
        {
                if(target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
                        user->Shrink("nick_locked");
                }
        }
 };
 
-// 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)