Header update: 2007 -> 2008

[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 75e01704409a2a16e9063e72b771ad857194f23f..9a625ed069dbb3d9776d6f9b866057b3c81a4494 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,26 +12,24 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
 /** Handle /SAJOIN
  */
-class cmd_sajoin : public command_t
+class CommandSajoin : public Command
 {
  public:
- cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
+       CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", 'o', 2, false, 0)
        {
                this->source = "m_sajoin.so";
                syntax = "<nick> <channel>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
                if (dest)
                {
                        if (ServerInstance->ULine(dest->server))
@@ -47,14 +45,14 @@ class cmd_sajoin : public command_t
                        }
 
                        /* For local users, we send the JoinUser which may create a channel and set its TS.
-                        * For non-local users, we just return CMD_SUCCESS, knowing this will propogate it where it needs to be
+                        * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be
                         * and then that server will generate the users JOIN or FJOIN instead.
                         */
                        if (IS_LOCAL(dest))
                        {
-                               chanrec::JoinUser(ServerInstance, dest, parameters[1], true, "", ServerInstance->Time(true));
-                               /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */
-                               chanrec* n = ServerInstance->FindChan(parameters[1]);
+                               Channel::JoinUser(ServerInstance, dest, parameters[1], true, "", false, ServerInstance->Time(true));
+                               /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */
+                               Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (n)
                                {
                                        if (n->HasUser(dest))
@@ -90,14 +88,15 @@ class cmd_sajoin : public command_t
 
 class ModuleSajoin : public Module
 {
-       cmd_sajoin*     mycommand;
+       CommandSajoin*  mycommand;
  public:
        ModuleSajoin(InspIRCd* Me)
                : Module(Me)
        {
                
-               mycommand = new cmd_sajoin(ServerInstance);
+               mycommand = new CommandSajoin(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSajoin()