Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 9b403506d72589141070022a396233b81acb8277..b7496a4ba1f122fa5c53b92a42ce8841ae80c377 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -21,16 +21,18 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
 
-static Server *Srv;
+
+
 
 class cmd_sethost : public command_t
 {
  public:
-       cmd_sethost() : command_t("SETHOST",'o',1)
+ cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
        {
                this->source = "m_sethost.so";
                syntax = "<new-hostname>";
@@ -40,7 +42,7 @@ class cmd_sethost : public command_t
        {
                if (strlen(parameters[0]) > 64)
                {
-                       WriteServ(user->fd,"NOTICE %s :*** SETHOST: Host too long",user->nick);
+                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
                        return;
                }
                for (unsigned int x = 0; x < strlen(parameters[0]); x++)
@@ -49,13 +51,13 @@ class cmd_sethost : public command_t
                        {
                                if (((parameters[0][x] < '0') || (parameters[0][x]> '9')) && (parameters[0][x] != '-'))
                                {
-                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
                                        return;
                                }
                        }
                }
-               Srv->ChangeHost(user,parameters[0]);
-               Srv->SendOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0]));
+               if (user->ChangeDisplayedHost(parameters[0]))
+                       ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0]));
        }
 };
 
@@ -64,12 +66,12 @@ class ModuleSetHost : public Module
 {
        cmd_sethost*    mycommand;
  public:
-       ModuleSetHost(Server* Me)
+       ModuleSetHost(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_sethost();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_sethost(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSetHost()
@@ -96,7 +98,7 @@ class ModuleSetHostFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSetHost(Me);
        }