All modules which implement simplemodes (no parameters, not a list mode) can now...

[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 65babdfa4c19e16c8acbf30de4258ca416ccf581..01a335f800716df45e3745a6e3e57ce28b8bc94a 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -21,18 +21,18 @@ 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>";
@@ -43,12 +43,12 @@ class cmd_sajoin : public command_t
                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;
                        }
-                       if (!IsValidChannelName(parameters[1]))
+                       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");
@@ -65,12 +65,12 @@ class ModuleSajoin : public Module
 {
        cmd_sajoin*     mycommand;
  public:
-       ModuleSajoin(Server* Me)
+       ModuleSajoin(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_sajoin();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_sajoin(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSajoin()
@@ -97,7 +97,7 @@ class ModuleSajoinFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSajoin(Me);
        }