X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=20b3a62e256a1a580a5f765a7483c41c427d515d;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=95321bc03de41dae3207824f523baa516364e9fc;hpb=b98acac5c91ecb08da28d70185818a19991eb1db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 95321bc03..20b3a62e2 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -50,13 +50,13 @@ class BanRedirect : public ModeWatcher
  public:
 	SimpleExtItem<BanRedirectList> extItem;
 	BanRedirect(Module* parent)
-		: ModeWatcher(parent, 'b', MODETYPE_CHANNEL)
+		: ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
 		, ban(parent, "ban")
 		, extItem("banredirect", parent)
 	{
 	}
 
-	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
+	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding)
 	{
 		/* nick!ident@host -> nick!ident@host
 		 * nick!ident@host#chan -> nick!ident@host#chan
@@ -65,7 +65,7 @@ class BanRedirect : public ModeWatcher
 		 * nick#chan -> nick!*@*#chan
 		 */
 
-		if(channel && (type == MODETYPE_CHANNEL) && param.length())
+		if ((channel) && !param.empty())
 		{
 			BanRedirectList* redirects;
 
@@ -90,23 +90,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;
 				}
 			}
@@ -137,7 +139,7 @@ class BanRedirect : public ModeWatcher
 			{
 				if (adding && IS_LOCAL(source))
 				{
-					if (!ServerInstance->IsChannel(mask[CHAN].c_str(),  ServerInstance->Config->Limits.ChanMax))
+					if (!ServerInstance->IsChannel(mask[CHAN]))
 					{
 						source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name.c_str(), mask[CHAN].c_str());
 						return false;
@@ -226,17 +228,15 @@ class ModuleBanRedirect : public Module
 	}
 
 
-	void init()
+	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));
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
+	void OnCleanup(int target_type, void* item) CXX11_OVERRIDE
 	{
 		if(target_type == TYPE_CHANNEL)
 		{
@@ -246,9 +246,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,17 +258,18 @@ 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());
 				}
 			}
 		}
 	}
 
-	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
 		{
@@ -338,14 +336,14 @@ class ModuleBanRedirect : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleBanRedirect()
+	~ModuleBanRedirect()
 	{
 		/* 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!");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
 	}