X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=28c0923065e20c30459bd9f977a3c2232089e1ee;hb=ea7aa89d61f5090ee7e7ecbe9eb633e1189ce40a;hp=7b4fe81de80f2b7bf60fc821d5c2870e8ea1bdbe;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 7b4fe81de..28c092306 100644
--- 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);
 	}
 	
@@ -55,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)
 	{
@@ -62,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());
@@ -71,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)
@@ -101,9 +125,9 @@ class ModuleRedirectFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleRedirect;
+		return new ModuleRedirect(Me);
 	}
 	
 };