X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=446d575df88f75810d04579adbf883bd432e9041;hb=24623a5fe6ff986ad342e2b00d3576b4899a6033;hp=8e4c5c6e52d50ef45a288fd2532c70b1d8f514b0;hpb=ca838821e7c53da0ddaee35d9a401e3a5eaf8c8c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 8e4c5c6e5..446d575df 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -25,8 +25,6 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-/* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
-
 /* Originally written by Om, January 2009
  */
 
@@ -46,11 +44,11 @@ typedef std::vector<BanRedirectEntry> BanRedirectList;
 
 class BanRedirect : public ModeWatcher
 {
-	ModeReference ban;
+	ChanModeReference ban;
  public:
 	SimpleExtItem<BanRedirectList> extItem;
 	BanRedirect(Module* parent)
-		: ModeWatcher(parent, 'b', MODETYPE_CHANNEL)
+		: ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
 		, ban(parent, "ban")
 		, extItem("banredirect", parent)
 	{
@@ -90,23 +88,25 @@ class BanRedirect : public ModeWatcher
 				switch(*curr)
 				{
 					case '!':
+						if (current != NICK)
+							break;
 						mask[current].assign(start_pos, curr);
 						current = IDENT;
 						start_pos = curr+1;
 						break;
 					case '@':
+						if (current != IDENT)
+							break;
 						mask[current].assign(start_pos, curr);
 						current = HOST;
 						start_pos = curr+1;
 						break;
 					case '#':
-						/* bug #921: don't barf when redirecting to ## channels */
-						if (current != CHAN)
-						{
-							mask[current].assign(start_pos, curr);
-							current = CHAN;
-							start_pos = curr;
-						}
+						if (current == CHAN)
+							break;
+						mask[current].assign(start_pos, curr);
+						current = CHAN;
+						start_pos = curr;
 						break;
 				}
 			}
@@ -217,20 +217,21 @@ class ModuleBanRedirect : public Module
 {
 	BanRedirect re;
 	bool nofollow;
+	ChanModeReference limitmode;
+	ChanModeReference redirectmode;
 
  public:
 	ModuleBanRedirect()
-	: re(this)
+		: re(this)
+		, nofollow(false)
+		, limitmode(this, "limit")
+		, redirectmode(this, "redirect")
 	{
-		nofollow = false;
 	}
 
-
 	void init() CXX11_OVERRIDE
 	{
-		if(!ServerInstance->Modes->AddModeWatcher(&re))
-			throw ModuleException("Could not add mode watcher");
-
+		ServerInstance->Modes->AddModeWatcher(&re);
 		ServerInstance->Modules->AddService(re.extItem);
 		Implementation list[] = { I_OnUserPreJoin };
 		ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
@@ -246,9 +247,6 @@ class ModuleBanRedirect : public Module
 			if(redirects)
 			{
 				irc::modestacker modestack(false);
-				std::vector<std::string> stackresult;
-				std::vector<std::string> mode_junk;
-				mode_junk.push_back(chan->name);
 
 				for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++)
 				{
@@ -261,11 +259,12 @@ class ModuleBanRedirect : public Module
 					modestack.Push('b', i->banmask);
 				}
 
-				while(modestack.GetStackedLine(stackresult))
+				std::vector<std::string> stackresult;
+				stackresult.push_back(chan->name);
+				while (modestack.GetStackedLine(stackresult))
 				{
-					mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
-					ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
-					mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
+					ServerInstance->Modes->Process(stackresult, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
+					stackresult.erase(stackresult.begin() + 1, stackresult.end());
 				}
 			}
 		}
@@ -315,9 +314,9 @@ class ModuleBanRedirect : public Module
 						std::string destlimit;
 
 						if (destchan)
-							destlimit = destchan->GetModeParameter('l');
+							destlimit = destchan->GetModeParameter(limitmode);
 
-						if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str())))
+						if(destchan && destchan->IsModeSet(redirectmode) && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str())))
 						{
 							user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
 							return MOD_RES_DENY;
@@ -342,7 +341,7 @@ class ModuleBanRedirect : public Module
 	{
 		/* XXX is this the best place to do this? */
 		if (!ServerInstance->Modes->DelModeWatcher(&re))
-			ServerInstance->Logs->Log("m_banredirect.so", LOG_DEBUG, "Failed to delete modewatcher!");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Failed to delete modewatcher!");
 	}
 
 	Version GetVersion() CXX11_OVERRIDE