* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
class PermChannel : public ModeHandler
{
public:
- PermChannel(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'P', PARAM_NONE, MODETYPE_CHANNEL) { }
+ PermChannel(Module* Creator) : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (!source->HasPrivPermission("channels/set-permanent"))
- {
- source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges", source->nick.c_str());
- return MODEACTION_DENY;
- }
-
if (adding)
{
if (!channel->IsModeSet('P'))
{
channel->SetMode('P',true);
-
- // Save permchannels db if needed.
- WriteDatabase();
return MODEACTION_ALLOW;
}
}
{
if (channel->IsModeSet('P'))
{
- if (channel->GetUserCounter() == 0 && !IS_FAKE(source))
+ channel->SetMode(this,false);
+ if (channel->GetUserCounter() == 0)
{
- /*
- * ugh, ugh, UGH!
- *
- * We can't delete this channel the way things work at the moment,
- * because of the following scenario:
- * s1:#c <-> s2:#c
- *
- * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS.
- *
- * On netmerge, s2 loses, so s2 removes all modes (including +P) which
- * would subsequently delete the channel here causing big fucking problems.
- *
- * I don't think there's really a way around this, so just deny -P on a 0 user chan.
- * -- w00t
- *
- * delete channel;
- */
- return MODEACTION_DENY;
+ channel->DelUser(ServerInstance->FakeClient);
}
-
- /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
- channel->SetMode('P',false);
-
- // Save permchannels db if needed.
- WriteDatabase();
return MODEACTION_ALLOW;
}
}
class ModulePermanentChannels : public Module
{
PermChannel p;
+ bool dirty;
public:
- ModulePermanentChannels(InspIRCd* Me) : Module(Me), p(Me, this)
+ ModulePermanentChannels() : p(this), dirty(false)
+ {
+ }
+
+ void init()
{
- if (!ServerInstance->Modes->AddMode(&p))
- throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ ServerInstance->Modules->AddService(p);
+ Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash, I_OnBackgroundTimer };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
OnRehash(NULL);
}
- virtual ~ModulePermanentChannels()
+ CullResult cull()
{
- ServerInstance->Modes->DelMode(&p);
/*
* DelMode can't remove the +P mode on empty channels, or it will break
* merging modes with remote servers. Remove the empty channels now as
{
chan_hash::iterator at = iter;
iter++;
+ FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(c));
ServerInstance->chanlist->erase(at);
- delete c;
+ ServerInstance->GlobalCulls.AddItem(c);
}
else
iter++;
}
+ ServerInstance->Modes->DelMode(&p);
+ return Module::cull();
}
virtual void OnRehash(User *user)
* Process config-defined list of permanent channels.
* -- w00t
*/
- ConfigReader MyConf(ServerInstance);
- permchannelsconf = MyConf.ReadValue("permchanneldb", "filename", "", 0, false);
+ permchannelsconf = ServerInstance->Config->ConfValue("permchanneldb")->getString("filename");
- for (int i = 0; i < MyConf.Enumerate("permchannels"); i++)
+ ConfigTagList permchannels = ServerInstance->Config->ConfTags("permchannels");
+ for (ConfigIter i = permchannels.first; i != permchannels.second; ++i)
{
- std::string channel = MyConf.ReadValue("permchannels", "channel", i);
- std::string topic = MyConf.ReadValue("permchannels", "topic", i);
- std::string modes = MyConf.ReadValue("permchannels", "modes", i);
+ ConfigTag* tag = i->second;
+ std::string channel = tag->getString("channel");
+ std::string topic = tag->getString("topic");
+ std::string modes = tag->getString("modes");
if (channel.empty())
{
if (!c)
{
- c = new Channel(ServerInstance, channel, ServerInstance->Time());
+ c = new Channel(channel, ServerInstance->Time());
if (!topic.empty())
{
c->SetTopic(NULL, topic, true);
virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt)
{
- if (chan && chan->IsModeSet('P'))
- WriteDatabase();
+ if (chan && (chan->IsModeSet('P') || mode == 'P'))
+ dirty = true;
return MOD_RES_PASSTHRU;
}
virtual void OnPostTopicChange(User*, Channel *c, const std::string&)
{
if (c->IsModeSet('P'))
+ dirty = true;
+ }
+
+ void OnBackgroundTimer(time_t)
+ {
+ if (dirty)
WriteDatabase();
+ dirty = false;
}
virtual Version GetVersion()
{
- return Version("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR);
}
virtual ModResult OnChannelPreDelete(Channel *c)
projects / user / henk / code / inspircd.git / blobdiff