4 files changed, 44 insertions, 0 deletions
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 6cc54db68..43b45be69 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -136,6 +136,8 @@ class JoinFlood : public ModeHandler
 					{
 						joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
 						channel->Extend("joinflood",(char*)f);
+						channel->SetMode('j', true);
+						channel->SetModeParam('j', parameter.c_str(), true);
 						return MODEACTION_ALLOW;
 					}
 				}
@@ -153,6 +155,7 @@ class JoinFlood : public ModeHandler
 				joinfloodsettings *f = (joinfloodsettings*)channel->GetExt("joinflood");
 				DELETE(f);
 				channel->Shrink("joinflood");
+				channel->SetMode('j', false);
 				return MODEACTION_ALLOW;
 			}
 		}
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 770b79db3..1c5333def 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -40,6 +40,8 @@ class KickRejoin : public ModeHandler
 		}
 		if ((!adding) || (atoi(parameter.c_str()) > 0))
 		{
+			channel->SetModeParam('J', parameter.c_str(), adding);
+			channel->SetMode('J', adding);
 			return MODEACTION_ALLOW;
 		}
 		else
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 2cbecfdac..bcec8248b 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -135,6 +135,8 @@ class MsgFlood : public ModeHandler
 					{
 						floodsettings *f = new floodsettings(ban,nsecs,nlines);
 						channel->Extend("flood",(char*)f);
+						channel->SetMode('f', true);
+						channel->SetModeParam('f', parameter.c_str(), true);
 						return MODEACTION_ALLOW;
 					}
 				}
@@ -153,6 +155,7 @@ class MsgFlood : public ModeHandler
 				floodsettings *f = (floodsettings*)channel->GetExt("flood");
 				DELETE(f);
 				channel->Shrink("flood");
+				channel->SetMode('f', false);
 				return MODEACTION_ALLOW;
 			}
 		}
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 799eb25de..e3da4622f 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -24,6 +24,42 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
+class Redirect : public ModeHandler
+{
+ public:
+	Redirect() : ModeHandler('L', 1, 0, false, MODETYPE_CHANNEL, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
+		{
+			chanrec* c = NULL;
+
+			if (!IsValidChannelName(parameter.c_str()))
+			{
+				WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameter.c_str());
+				parameter = "";
+				return MODEACTION_DENY;
+			}
+
+			c = Srv->FindChannel(parameter);
+			if (c)
+			{
+				/* Fix by brain: Dont let a channel be linked to *itself* either */
+				if ((c == target) || (c->IsModeSet('L')))
+				{
+					WriteServ(user->fd,"690 %s :Circular redirection, mode +L to %s not allowed.",user->nick,parameter.c_str());
+					parameter = "";
+					return MODEACTION_DENY;
+				}
+			}
+
+			c->SetMode('L', true);
+			c->SetModeParam('L', parameter);
+			return MODEACTION_ALLOW;
+		}
+	}
+};
 
 class ModuleRedirect : public Module
 {