New 'Implements' system

[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 e818645652c47e15e5fb0d5efbd817f551ee7795..28c0923065e20c30459bd9f977a3c2232089e1ee 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -14,10 +14,13 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
@@ -28,9 +31,10 @@ class ModuleRedirect : public Module
        
  public:
  
-       ModuleRedirect()
+       ModuleRedirect(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Srv->AddExtendedMode('L',MT_CHANNEL,false,1,0);
        }
        
@@ -72,7 +76,8 @@ class ModuleRedirect : public Module
                         }
                         temp2 = temp2 + temp1 + " ";
                 }
-                output = temp2.substr(0,temp2.length()-1);
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
         }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -81,7 +86,7 @@ class ModuleRedirect : public Module
                {
                        if (chan->IsCustomModeSet('L'))
                        {
-                               if (chan->limit >= Srv->CountUsers(chan))
+                               if (Srv->CountUsers(chan) >= chan->limit)
                                {
                                        std::string channel = chan->GetModeParameter('L');
                                        WriteServ(user->fd,"470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel.c_str());
@@ -90,16 +95,16 @@ class ModuleRedirect : public Module
                                }
                        }
                }
+               return 0;
        }
 
        virtual ~ModuleRedirect()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
        
        virtual void OnUserConnect(userrec* user)
@@ -120,9 +125,9 @@ class ModuleRedirectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleRedirect;
+               return new ModuleRedirect(Me);
        }
        
 };