Fix these too!

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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 643d972d18ff846101b55dfe0ae28c8d527b64fa..a3a03b4ceb8bd851471c285df1c8baf5851c69c7 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -16,22 +16,19 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
-extern InspIRCd* ServerInstance;
-
+/** Handle channel mode +L
+ */
 class Redirect : public ModeHandler
 {
-       Server* Srv;
  public:
-       Redirect(Server* s) : ModeHandler('L', 1, 0, false, MODETYPE_CHANNEL, false), Srv(s) { }
+       Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
         ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
         {
@@ -53,7 +50,7 @@ class Redirect : public ModeHandler
                {
                        chanrec* c = NULL;
 
-                       if (!IsValidChannelName(parameter.c_str()))
+                       if (!ServerInstance->IsChannel(parameter.c_str()))
                        {
                                source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
                                parameter = "";
@@ -106,34 +103,29 @@ class Redirect : public ModeHandler
 
 class ModuleRedirect : public Module
 {
-       Server *Srv;
+       
        Redirect* re;
        
  public:
  
-       ModuleRedirect(Server* Me)
+       ModuleRedirect(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               re = new Redirect(Me);
-               Srv->AddMode(re, 'L');
+               
+               re = new Redirect(ServerInstance);
+               ServerInstance->AddMode(re, 'L');
        }
        
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+               List[I_OnUserPreJoin] = 1;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output, "L", 3);
-       }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {
-                       if (chan->IsModeSet('L'))
+                       if (chan->IsModeSet('L') && chan->limit)
                        {
                                if (chan->GetUserCounter() >= chan->limit)
                                {
@@ -149,12 +141,13 @@ class ModuleRedirect : public Module
 
        virtual ~ModuleRedirect()
        {
+               ServerInstance->Modes->DelMode(re);
                DELETE(re);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
@@ -170,7 +163,7 @@ class ModuleRedirectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleRedirect(Me);
        }