X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=766158a21f9705cb51017ef70bf8c21aa3bf3d5f;hb=da53c17315d3eb0d0177608d306d208bdf05786b;hp=9a5da5ce49e2313f85ee907beadb14d63957b5ab;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 9a5da5ce4..766158a21 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -34,7 +34,7 @@ class PermChannel : public ModeHandler
 		oper = true;
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
 		if (adding == channel->IsModeSet(this))
 			return MODEACTION_DENY;
@@ -193,9 +193,9 @@ public:
 			std::string channel = tag->getString("channel");
 			std::string modes = tag->getString("modes");
 
-			if ((channel.empty()) || (channel.length() > ServerInstance->Config->Limits.ChanMax))
+			if (!ServerInstance->IsChannel(channel))
 			{
-				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring permchannels tag with empty or too long channel name (\"" + channel + "\")");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring permchannels tag with invalid channel name (\"" + channel + "\")");
 				continue;
 			}
 
@@ -206,7 +206,7 @@ public:
 				time_t TS = tag->getInt("ts", ServerInstance->Time(), 1);
 				c = new Channel(channel, TS);
 
-				unsigned int topicset = tag->getInt("topicts");
+				time_t topicset = tag->getInt("topicts", 0);
 				std::string topic = tag->getString("topic");
 
 				if ((topicset != 0) || (!topic.empty()))
@@ -236,7 +236,7 @@ public:
 					ModeHandler* mode = ServerInstance->Modes->FindMode(*n, MODETYPE_CHANNEL);
 					if (mode)
 					{
-						if (mode->GetNumParams(true))
+						if (mode->NeedsParam(true))
 							list.GetToken(par);
 						else
 							par.clear();
@@ -244,6 +244,10 @@ public:
 						mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, c, par, true);
 					}
 				}
+
+				// We always apply the permchannels mode to permanent channels.
+				par.clear();
+				p.OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, c, par, true);
 			}
 		}
 	}
@@ -269,7 +273,7 @@ public:
 		dirty = false;
 	}
 
-	void Prioritize()
+	void Prioritize() CXX11_OVERRIDE
 	{
 		// XXX: Load the DB here because the order in which modules are init()ed at boot is
 		// alphabetical, this means we must wait until all modules have done their init()
@@ -301,7 +305,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR);
+		return Version("Provides channel mode +P to provide permanent channels", VF_VENDOR);
 	}
 
 	ModResult OnChannelPreDelete(Channel *c) CXX11_OVERRIDE