X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=c5a7f8e9c8b6b2b38ee397fd249881159311c8de;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=a91ddef7f6104d0d00424a8e1add07f2cfd956bf;hpb=675698fff9da3b409386b17f18a3d8a7dfe15568;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index a91ddef7f..c5a7f8e9c 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -24,54 +24,103 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
+extern chan_hash chanlist;
 
-class ModuleRedirect : public Module
+class Redirect : public ModeHandler
 {
-	Server *Srv;
-	
+	Server* Srv;
  public:
- 
-	ModuleRedirect(Server* Me)
-		: Module::Module(Me)
+	Redirect(Server* s) : ModeHandler('L', 1, 0, false, MODETYPE_CHANNEL, false), Srv(s) { }
+
+        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+        {
+                if (channel->IsModeSet('L'))
+                        return std::make_pair(true, channel->GetModeParameter('L'));
+                else
+                        return std::make_pair(false, parameter);
+        }
+
+        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
 	{
-		Srv = Me;
-		Srv->AddExtendedMode('L',MT_CHANNEL,false,1,0);
-	}
+		/* When TS is equal, the alphabetically later one wins */
+		return (their_param < our_param);
+        }
 	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		if ((modechar == 'L') && (type == MT_CHANNEL))
+		if (adding)
 		{
-			if (mode_on)
-			{
-				std::string ChanToJoin = params[0];
-				chanrec *c;
+			chanrec* c = NULL;
 
-				if (!IsValidChannelName(ChanToJoin.c_str()))
-				{
-					WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, ChanToJoin.c_str());
-					return 0;
-				}
+			if (!IsValidChannelName(parameter.c_str()))
+			{
+				source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
+				parameter = "";
+				return MODEACTION_DENY;
+			}
 
-				c = Srv->FindChannel(ChanToJoin);
-				if (c)
+			c = Srv->FindChannel(parameter);
+			if (c)
+			{
+				/* Fix by brain: Dont let a channel be linked to *itself* either */
+				if (IS_LOCAL(source))
 				{
-					/* Fix by brain: Dont let a channel be linked to *itself* either */
-					if ((c == target) || (c->IsCustomModeSet('L')))
+					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
 					{
-						WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,params[0].c_str());
-     						return 0;
+						for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
+						{
+							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;
+							}
+						}
 					}
 				}
 			}
-			return 1;
+
+			channel->SetMode('L', true);
+			channel->SetModeParam('L', parameter.c_str(), true);
+			return MODEACTION_ALLOW;
+		}
+		else
+		{
+			if (channel->IsModeSet('L'))
+			{
+				channel->SetMode('L', false);
+				return MODEACTION_ALLOW;
+			}
 		}
-		return 0;
+
+		return MODEACTION_DENY;
+		
 	}
+};
 
+class ModuleRedirect : public Module
+{
+	Server *Srv;
+	Redirect* re;
+	
+ public:
+ 
+	ModuleRedirect(Server* Me)
+		: Module::Module(Me)
+	{
+		Srv = Me;
+		re = new Redirect(Me);
+		Srv->AddMode(re, 'L');
+	}
+	
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnExtendedMode] = 1;
+		List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -83,13 +132,13 @@ class ModuleRedirect : public Module
 	{
 		if (chan)
 		{
-			if (chan->IsCustomModeSet('L'))
+			if (chan->IsModeSet('L'))
 			{
 				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());
-					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(user, channel.c_str(), false);
 					return 1;
 				}
 			}
@@ -99,6 +148,7 @@ class ModuleRedirect : public Module
 
 	virtual ~ModuleRedirect()
 	{
+		DELETE(re);
 	}
 	
 	virtual Version GetVersion()