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_sajoin.cpp

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index a170bc2bbc2021e7c7242f6802ce0b9284e68df3..2fe790b6f1e208a563ec072745b79b96b5efbba1 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -21,43 +21,45 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
 
 class cmd_sajoin : public command_t
 {
  public:
-       cmd_sajoin() : command_t("SAJOIN", 'o', 2)
+ cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
        {
                this->source = "m_sajoin.so";
                syntax = "<nick> <channel>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
-                       if (Srv->IsUlined(dest->server))
+                       if (ServerInstance->ULine(dest->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
                        if (!ServerInstance->IsChannel(parameters[1]))
                        {
                                /* we didn't need to check this for each character ;) */
                                user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                               return;
+                               return CMD_FAILURE;
                        }
 
                        ServerInstance->WriteOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
                        chanrec::JoinUser(ServerInstance, dest, parameters[1], true);
                }
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -69,8 +71,8 @@ class ModuleSajoin : public Module
                : Module::Module(Me)
        {
                
-               mycommand = new cmd_sajoin();
-               Srv->AddCommand(mycommand);
+               mycommand = new cmd_sajoin(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSajoin()