X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=4e365d0abe48ba5fcd37bd7471b78d4974c0bc3f;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=0f2a2ef6f3506c069fa6d0175bd462474e2ed2c0;hpb=e191f0ed6cdca421407ebc67c28fafabc6cc63f7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 0f2a2ef6f..4e365d0ab 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;
@@ -51,7 +51,6 @@ class PermChannel : public ModeHandler
 static std::string permchannelsconf;
 static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_listmodes)
 {
-	ChanModeReference ban(mod, "ban");
 	/*
 	 * We need to perform an atomic write so as not to fuck things up.
 	 * So, let's write to a temporary file, flush it, then rename the file..
@@ -157,7 +156,10 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
 	return true;
 }
 
-class ModulePermanentChannels : public Module
+class ModulePermanentChannels
+	: public Module
+	, public Timer
+
 {
 	PermChannel p;
 	bool dirty;
@@ -166,7 +168,10 @@ class ModulePermanentChannels : public Module
 public:
 
 	ModulePermanentChannels()
-		: p(this), dirty(false), loaded(false)
+		: Timer(0, true)
+		, p(this)
+		, dirty(false)
+		, loaded(false)
 	{
 	}
 
@@ -175,6 +180,7 @@ public:
 		ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
 		permchannelsconf = tag->getString("filename");
 		save_listmodes = tag->getBool("listmodes");
+		SetInterval(tag->getDuration("saveperiod", 5));
 
 		if (!permchannelsconf.empty())
 			permchannelsconf = ServerInstance->Config->Paths.PrependConfig(permchannelsconf);
@@ -193,9 +199,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 +212,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()))
@@ -266,11 +272,12 @@ public:
 			dirty = true;
 	}
 
-	void OnBackgroundTimer(time_t) CXX11_OVERRIDE
+	bool Tick(time_t) CXX11_OVERRIDE
 	{
 		if (dirty)
 			WriteDatabase(p, this, save_listmodes);
 		dirty = false;
+		return true;
 	}
 
 	void Prioritize() CXX11_OVERRIDE
@@ -305,7 +312,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