Annotations

[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 2f80e0d51b7537e9212a32a0c3c4ef24aea3cfb2..d44cc29acf7569e68a7a6a795bc18f85619a4c1c 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -21,25 +21,25 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.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 */
 
-extern InspIRCd* ServerInstance;
+
 
 class cmd_nicklock : public command_t
 {
        char* dummy;
  public:
-       cmd_nicklock () : command_t("NICKLOCK", 'o', 2)
+ cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
        {
                this->source = "m_nicklock.so";
                syntax = "<oldnick> <newnick>";
        }
 
-       void Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
                userrec* source = ServerInstance->FindNick(parameters[0]);
                irc::string server;
@@ -50,7 +50,7 @@ class cmd_nicklock : public command_t
                        if (source->GetExt("nick_locked", dummy))
                        {
                                user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
                        if (ServerInstance->IsNick(parameters[1]))
                        {
@@ -59,24 +59,30 @@ class cmd_nicklock : public command_t
                                if (!source->ForceNickChange(parameters[1]))
                                {
                                        userrec::QuitUser(ServerInstance, source, "Nickname collision");
-                                       return;
+                                       return CMD_FAILURE;
                                }
                                source->Extend("nick_locked", "ON");
+
+                               return CMD_SUCCESS;
                        }
+
+                       return CMD_FAILURE;
                }
+
+               return CMD_FAILURE;
        }
 };
 
 class cmd_nickunlock : public command_t
 {
  public:
-       cmd_nickunlock () : command_t("NICKUNLOCK", 'o', 1)
+ cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
        {
                this->source = "m_nickunlock.so";
                syntax = "<locked-nick>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec* source = ServerInstance->FindNick(parameters[0]);
                if (source)
@@ -84,7 +90,10 @@ class cmd_nickunlock : public command_t
                        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]);
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -99,8 +108,8 @@ class ModuleNickLock : public Module
                : Module::Module(Me)
        {
                
-               cmd1 = new cmd_nicklock();
-               cmd2 = new cmd_nickunlock();
+               cmd1 = new cmd_nicklock(ServerInstance);
+               cmd2 = new cmd_nickunlock(ServerInstance);
                ServerInstance->AddCommand(cmd1);
                ServerInstance->AddCommand(cmd2);
        }