Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 180a989c950eeed9414e4cc9e7c2f8a69f97a764..4f153d4960c87c68bf641225c6efc6fb8e66bcf0 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,27 +19,23 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "commands.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
-extern InspIRCd* ServerInstance;
 
-static Server *Srv;
 
 class cmd_check : public command_t
 {
  public:
-       cmd_check() : command_t("CHECK", 'o', 1)
+       cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1)
        {
                this->source = "m_check.so";
                syntax = "<nickname>|<ip>|<hostmask>|<channel>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec *targuser;
                chanrec *targchan;
@@ -91,7 +87,7 @@ class cmd_check : public command_t
                        chliststr = targuser->ChannelList(targuser);
                        std::stringstream dump(chliststr);
 
-                       Srv->DumpText(user,checkstr + " onchans ", dump);
+                       ServerInstance->DumpText(user,checkstr + " onchans ", dump);
                }
                else if (targchan)
                {
@@ -179,6 +175,8 @@ class cmd_check : public command_t
                }
 
                user->WriteServ(checkstr + " END " + std::string(parameters[0]));
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -188,11 +186,11 @@ class ModuleCheck : public Module
  private:
        cmd_check *mycommand;
  public:
-       ModuleCheck(Server* Me) : Module::Module(Me)
+       ModuleCheck(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_check();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_check(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleCheck()
@@ -224,7 +222,7 @@ class ModuleCheckFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleCheck(Me);
        }