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 307afb3a3520f989bf91f9d73b2c3377ddf30951..28c0923065e20c30459bd9f977a3c2232089e1ee 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -1,8 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+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) */
 
@@ -13,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);
        }
        
@@ -40,6 +59,26 @@ class ModuleRedirect : public Module
                }
                return 0;
        }
+
+        virtual void On005Numeric(std::string &output)
+        {
+                std::stringstream line(output);
+                std::string temp1, temp2;
+                while (!line.eof())
+                {
+                        line >> temp1;
+                        if (temp1.substr(0,10) == "CHANMODES=")
+                        {
+                               // By doing this we're *assuming* no other module has fucked up the CHANMODES=
+                               // section of the 005 numeric. If they have, we're going DOWN in a blaze of glory,
+                               // with a honking great EXCEPTION :)
+                               temp1.insert(temp1.find(",")+1,"L");
+                        }
+                        temp2 = temp2 + temp1 + " ";
+                }
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
+        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
@@ -47,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());
@@ -56,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)
@@ -86,9 +125,9 @@ class ModuleRedirectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleRedirect;
+               return new ModuleRedirect(Me);
        }
        
 };