X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=7513cb33ab591b30fe77cb7670c91edb9cd568e5;hb=0ec19b7ac91eedc83b31c3da733e237bfe28fc48;hp=fcb2ef6d74d7fda8d38bcfbe0bb34138cb7ca19e;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index fcb2ef6d7..7513cb33a 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -24,8 +24,6 @@ static std::bitset<256> allowedmap;
 class NewIsChannelHandler : public HandlerBase1<bool, const std::string&>
 {
  public:
-	NewIsChannelHandler() { }
-	~NewIsChannelHandler() { }
 	bool Call(const std::string&);
 };
 
@@ -62,38 +60,37 @@ class ModuleChannelNames : public Module
 	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->IsChannel = &myhandler;
-		OnRehash(NULL);
 	}
 
 	void ValidateChans()
 	{
+		Modes::ChangeList removepermchan;
+
 		badchan = true;
-		std::vector<Channel*> chanvec;
-		for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
-		{
-			if (!ServerInstance->IsChannel(i->second->name))
-				chanvec.push_back(i->second);
-		}
-		std::vector<Channel*>::reverse_iterator c2 = chanvec.rbegin();
-		while (c2 != chanvec.rend())
+		const chan_hash& chans = ServerInstance->GetChans();
+		for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); )
 		{
-			Channel* c = *c2++;
+			Channel* c = i->second;
+			// Move iterator before we begin kicking
+			++i;
+			if (ServerInstance->IsChannel(c->name))
+				continue; // The name of this channel is still valid
+
 			if (c->IsModeSet(permchannelmode) && c->GetUserCounter())
 			{
-				std::vector<std::string> modes;
-				modes.push_back(c->name);
-				modes.push_back(std::string("-") + permchannelmode->GetModeChar());
-
-				ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+				removepermchan.clear();
+				removepermchan.push_remove(*permchannelmode);
+				ServerInstance->Modes->Process(ServerInstance->FakeClient, c, NULL, removepermchan);
 			}
-			const UserMembList* users = c->GetUsers();
-			for(UserMembCIter j = users->begin(); j != users->end(); )
+
+			Channel::MemberMap& users = c->userlist;
+			for (Channel::MemberMap::iterator j = users.begin(); j != users.end(); )
 			{
 				if (IS_LOCAL(j->first))
 				{
 					// KickUser invalidates the iterator
-					UserMembCIter it = j++;
-					c->KickUser(ServerInstance->FakeClient, it->first, "Channel name no longer valid");
+					Channel::MemberMap::iterator it = j++;
+					c->KickUser(ServerInstance->FakeClient, it, "Channel name no longer valid");
 				}
 				else
 					++j;
@@ -102,11 +99,17 @@ class ModuleChannelNames : public Module
 		badchan = false;
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("channames");
 		std::string denyToken = tag->getString("denyrange");
 		std::string allowToken = tag->getString("allowrange");
+
+		if (!denyToken.compare(0, 2, "0-"))
+			denyToken[0] = '1';
+		if (!allowToken.compare(0, 2, "0-"))
+			allowToken[0] = '1';
+
 		allowedmap.set();
 
 		irc::portparser denyrange(denyToken, false);
@@ -130,17 +133,18 @@ class ModuleChannelNames : public Module
 	{
 		if (badchan)
 		{
-			const UserMembList* users = memb->chan->GetUsers();
-			for(UserMembCIter i = users->begin(); i != users->end(); i++)
+			const Channel::MemberMap& users = memb->chan->GetUsers();
+			for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
 				if (i->first != memb->user)
 					except_list.insert(i->first);
 		}
 	}
 
-	~ModuleChannelNames()
+	CullResult cull() CXX11_OVERRIDE
 	{
 		ServerInstance->IsChannel = rememberer;
 		ValidateChans();
+		return Module::cull();
 	}
 
 	Version GetVersion() CXX11_OVERRIDE