Add VF_COMMON to a lot modules which require it. Reported by danielg in bug #369...

[user/henk/code/inspircd.git] / src / modules / m_sanick.cpp

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 0d9167c26020cadd1bcd77d6b3af13d782943c5d..02f0c3fa5c10f7b73b24912d9f13acb5d0282ca6 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -2,32 +2,24 @@
  *       | 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.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for SANICK command */
 
-
-
-
+/** Handle /SANICK
+ */
 class cmd_sanick : public command_t
 {
  public:
@@ -37,29 +29,44 @@ class cmd_sanick : public command_t
                syntax = "<nick> <new-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)
                {
-                       if (ServerInstance->IsUlined(source->server))
+                       if (ServerInstance->ULine(source->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
+                       std::string oldnick = user->nick;
                        if (ServerInstance->IsNick(parameters[1]))
                        {
-                               // FIX by brain: Cant use source->nick here because if it traverses a server link then
-                               // source->nick becomes invalid as the object data moves in memory.
-                               ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
-                               if (!source->ForceNickChange(parameters[1]))
+                               if (source->ForceNickChange(parameters[1]))
+                               {
+                                       ServerInstance->WriteOpers("*** " + oldnick+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
                                {
                                        /* We couldnt change the nick */
-                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
-                                       return;
+                                       ServerInstance->WriteOpers("*** " + oldnick+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+                                       return CMD_FAILURE;
                                }
                        }
+                       else
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+                       }
+
+                       return CMD_FAILURE;
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0]);
+               }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -69,7 +76,7 @@ class ModuleSanick : public Module
        cmd_sanick*     mycommand;
  public:
        ModuleSanick(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_sanick(ServerInstance);
@@ -82,34 +89,9 @@ class ModuleSanick : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSanickFactory : public ModuleFactory
-{
- public:
-       ModuleSanickFactory()
-       {
-       }
-       
-       ~ModuleSanickFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSanick(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSanickFactory;
-}
-
+MODULE_INIT(ModuleSanick)