Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 65ef97d4b33c15c4b60599e8c33ef5cd4bfa1633..a14bfc097e543283636764074052a20b147277ea 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -2,68 +2,67 @@
  *       | 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-2008 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 "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for SANICK command */
 
-
-
-
-class cmd_sanick : public command_t
+/** Handle /SANICK
+ */
+class CommandSanick : public Command
 {
  public:
- cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
+       CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", "o", 2, false, 0)
        {
                this->source = "m_sanick.so";
                syntax = "<nick> <new-nick>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               userrec* source = ServerInstance->FindNick(parameters[0]);
-               if (source)
+               User* target = ServerInstance->FindNick(parameters[0]);
+               if (target)
                {
-                       if (ServerInstance->ULine(source->server))
+                       if (ServerInstance->ULine(target->server))
                        {
-                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
-                       if (ServerInstance->IsNick(parameters[1]))
+                       std::string oldnick = user->nick;
+                       if (IS_LOCAL(user) && !ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+                       }
+                       else
                        {
-                               if (source->ForceNickChange(parameters[1]))
+                               if (target->ForceNickChange(parameters[1].c_str()))
                                {
-                                       ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       ServerInstance->SNO->WriteToSnoMask('A', oldnick+" used SANICK to change "+parameters[0]+" to "+parameters[1]);
                                        return CMD_SUCCESS;
                                }
                                else
                                {
                                        /* We couldnt change the nick */
-                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
+                                       ServerInstance->SNO->WriteToSnoMask('A', oldnick+" failed SANICK (from "+parameters[0]+" to "+parameters[1]+")");
                                        return CMD_FAILURE;
                                }
                        }
 
                        return CMD_FAILURE;
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+               }
 
                return CMD_FAILURE;
        }
@@ -72,50 +71,26 @@ class cmd_sanick : public command_t
 
 class ModuleSanick : public Module
 {
-       cmd_sanick*     mycommand;
+       CommandSanick*  mycommand;
  public:
        ModuleSanick(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
-               
-               mycommand = new cmd_sanick(ServerInstance);
+
+               mycommand = new CommandSanick(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
-       
+
        virtual ~ModuleSanick()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1, 2, 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)