Change to use std::string::iterator rather than making a copy of the pointer and...

[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 f6f88993a7da7b1ee5ddbed934e6abe1e05daabe..5b7e78faffcd06361444c2c07616f80f60293c43 100644 (file)
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -2,45 +2,40 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #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 */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
 
+/** Handle /NICKLOCK
+ */
 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;
@@ -51,7 +46,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]))
                        {
@@ -60,24 +55,32 @@ 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;
        }
 };
 
+/** Handle /NICKUNLOCK
+ */
 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)
@@ -85,7 +88,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;
        }
 };
 
@@ -96,14 +102,14 @@ class ModuleNickLock : public Module
        cmd_nickunlock* cmd2;
        char* n;
  public:
-       ModuleNickLock(Server* Me)
+       ModuleNickLock(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               cmd1 = new cmd_nicklock();
-               cmd2 = new cmd_nickunlock();
-               Srv->AddCommand(cmd1);
-               Srv->AddCommand(cmd2);
+               
+               cmd1 = new cmd_nicklock(ServerInstance);
+               cmd2 = new cmd_nickunlock(ServerInstance);
+               ServerInstance->AddCommand(cmd1);
+               ServerInstance->AddCommand(cmd2);
        }
        
        virtual ~ModuleNickLock()
@@ -112,7 +118,7 @@ class ModuleNickLock : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
        void Implements(char* List)
@@ -158,7 +164,7 @@ class ModuleNickLockFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleNickLock(Me);
        }