X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=ab992a05abf0fa9c17309cfd31bb6e50237c1b81;hb=f72b7a7194b7225a4df5de4d8b5848f5b733b789;hp=2a7ef4b549d58e5116ee966c4178a6d1aade174d;hpb=e3bd782207f50d131acd008b0cbcc7545aac7690;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 2a7ef4b54..ab992a05a 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -35,46 +35,39 @@ class Redirect : public ModeHandler
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
-	
+
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
 			Channel* c = NULL;
 
-			if (!ServerInstance->IsChannel(parameter.c_str()))
+			if (IS_LOCAL(source) && !ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax))
 			{
-				source->WriteNumeric(403, "%s %s :Invalid channel name",source->nick.c_str(), parameter.c_str());
+				source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str());
 				parameter.clear();
 				return MODEACTION_DENY;
 			}
 
 			c = ServerInstance->FindChan(parameter);
-			if (c)
+			if (!c && !IS_OPER(source))
 			{
-				/* Fix by brain: Dont let a channel be linked to *itself* either */
-				if (IS_LOCAL(source))
-				{
-					if ((c == channel) || (c->IsModeSet('L')))
-					{
-						source->WriteNumeric(690, "%s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick.c_str(),parameter.c_str());
-						parameter.clear();
-						return MODEACTION_DENY;
-					}
-					else
-					{
-						for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
-						{
-							if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name)))
-							{
-								source->WriteNumeric(690, "%s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick.c_str(),parameter.c_str(),i->second->name);
-								return MODEACTION_DENY;
-							}
-						}
-					}
-				}
+				source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),parameter.c_str());
+				parameter.clear();
+				return MODEACTION_DENY;
 			}
 
+			if (c && c->GetStatus(source) < STATUS_OP && !IS_OPER(source))
+			{
+				source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(),parameter.c_str());
+				parameter.clear();
+				return MODEACTION_DENY;
+			}
+
+			/*
+			 * We used to do some checking for circular +L here, but there is no real need for this any more especially as we
+			 * now catch +L looping in PreJoin. Remove it, since O(n) logic makes me sad, and we catch it anyway. :) -- w00t
+			 */
 			channel->SetMode('L', true);
 			channel->SetModeParam('L', parameter.c_str(), true);
 			return MODEACTION_ALLOW;
@@ -89,36 +82,36 @@ class Redirect : public ModeHandler
 		}
 
 		return MODEACTION_DENY;
-		
+
 	}
 };
 
 class ModuleRedirect : public Module
 {
-	
+
 	Redirect* re;
-	
+
  public:
- 
+
 	ModuleRedirect(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		re = new Redirect(ServerInstance);
 		if (!ServerInstance->Modes->AddMode(re))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnUserPreJoin };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
-	
+
 
 	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if (chan)
 		{
-			if (chan->IsModeSet('L') && chan->limit)
+			if (chan->IsModeSet('L') && chan->modes[CM_LIMIT])
 			{
-				if (chan->GetUserCounter() >= chan->limit)
+				if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str()))
 				{
 					std::string channel = chan->GetModeParameter('L');
 
@@ -127,11 +120,11 @@ class ModuleRedirect : public Module
 					destchan = ServerInstance->FindChan(channel);
 					if (destchan && destchan->IsModeSet('L'))
 					{
-						user->WriteNumeric(470, "%s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick.c_str(), cname, channel.c_str());
+						user->WriteNumeric(470, "%s %s * :You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.", user->nick.c_str(), cname);
 						return 1;
 					}
 
-					user->WriteNumeric(470, "%s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick.c_str(), cname, channel.c_str());
+					user->WriteNumeric(470, "%s %s  %s:You may not join this channel, so you are automatically being transferred to the redirect channel.", user->nick.c_str(), cname, channel.c_str());
 					Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
 					return 1;
 				}
@@ -145,10 +138,10 @@ class ModuleRedirect : public Module
 		ServerInstance->Modes->DelMode(re);
 		delete re;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };