Add a metric assload of TRANSLATE macros to modules.

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

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 45eaaa37827052b958d7e0f9a7c32f5eaa3d9e6a..5f56236826931a9e4a556314e727a6547a625319 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
@@ -32,6 +26,7 @@ class cmd_chghost : public command_t
        {
                this->source = "m_chghost.so";
                syntax = "<nick> <newhost>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
  
        CmdResult Handle(const char** parameters, int pcnt, userrec *user)
@@ -42,20 +37,26 @@ class cmd_chghost : public command_t
                {
                        if (!hostmap[(unsigned char)*x])
                        {
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** CHGHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
                        }
                }
+               if (!*parameters[0])
+               {
+                       user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick);
+                       return CMD_FAILURE;
+               }
+               
                if ((parameters[1] - x) > 63)
                {
-                       user->WriteServ("NOTICE %s :*** CHGHOST: Host too long",user->nick);
+                       user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick);
                        return CMD_FAILURE;
                }
                userrec* dest = ServerInstance->FindNick(parameters[0]);
 
                if (!dest)
                {
-                       /* Drop it like a hot potato. XXX - we should probably message here.. -- w00t */
+                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
                        return CMD_FAILURE;
                }
 
@@ -78,7 +79,7 @@ class ModuleChgHost : public Module
        char hostmap[256];
  public:
        ModuleChgHost(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                OnRehash(NULL,"");
                mycommand = new cmd_chghost(ServerInstance, hostmap);
@@ -109,33 +110,9 @@ class ModuleChgHost : public Module
        
        Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-
-class ModuleChgHostFactory : public ModuleFactory
-{
- public:
-       ModuleChgHostFactory()
-       {
-       }
-       
-       ~ModuleChgHostFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChgHost(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleChgHostFactory;
-}
-
+MODULE_INIT(ModuleChgHost)