X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=efd9b8b1c5a4497b2155f2ce4164957889bb8365;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=8d2d152c204d7c282c3a2cb96bb0523a83e8cb83;hpb=6353036b7c46a5d47929f02957eed24aad3c2be7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 8d2d152c2..efd9b8b1c 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -16,21 +16,17 @@
 
 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 chan_hash chanlist;
-
 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)
         {
@@ -52,31 +48,34 @@ class Redirect : public ModeHandler
 		{
 			chanrec* c = NULL;
 
-			if (!IsValidChannelName(parameter.c_str()))
+			if (!ServerInstance->IsChannel(parameter.c_str()))
 			{
-				WriteServ(source->fd,"403 %s %s :Invalid channel name",source->nick, parameter.c_str());
+				source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
 				parameter = "";
 				return MODEACTION_DENY;
 			}
 
-			c = Srv->FindChannel(parameter);
+			c = ServerInstance->FindChan(parameter);
 			if (c)
 			{
 				/* Fix by brain: Dont let a channel be linked to *itself* either */
-				if ((c == channel) || (c->IsModeSet('L')))
-				{
-					WriteServ(source->fd,"690 %s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick,parameter.c_str());
-					parameter = "";
-					return MODEACTION_DENY;
-				}
-				else
+				if (IS_LOCAL(source))
 				{
-					for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
+					if ((c == channel) || (c->IsModeSet('L')))
+					{
+						source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick,parameter.c_str());
+						parameter = "";
+						return MODEACTION_DENY;
+					}
+					else
 					{
-						if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name)))
+						for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
 						{
-							WriteServ(source->fd,"690 %s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick,parameter.c_str(),i->second->name);
-							return MODEACTION_DENY;
+							if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name)))
+							{
+								source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick,parameter.c_str(),i->second->name);
+								return MODEACTION_DENY;
+							}
 						}
 					}
 				}
@@ -102,40 +101,35 @@ 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)
-	{
-		InsertMode(output, "L", 3);
-	}
-	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
 		if (chan)
 		{
-			if (chan->IsModeSet('L'))
+			if (chan->IsModeSet('L') && chan->limit)
 			{
-				if (Srv->CountUsers(chan) >= chan->limit)
+				if (chan->GetUserCounter() >= 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());
-					Srv->JoinUserToChannel(user,channel.c_str(),"");
+					user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel.c_str());
+					chanrec::JoinUser(ServerInstance, user, channel.c_str(), false);
 					return 1;
 				}
 			}
@@ -145,12 +139,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, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 };
 
@@ -166,7 +161,7 @@ class ModuleRedirectFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleRedirect(Me);
 	}