X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=a3d023ffe39fdd57f8eed96f474bc8c16a90d63e;hb=04cfaea87edd1b4b742cb607ea69ece760c460aa;hp=3317b5c0894364dddca737c1fbc8f8dd8b2c9fb1;hpb=ff8ba4135c1808612ce9681544bccd7a6456f1bd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 3317b5c08..a3d023ffe 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -2,7 +2,7 @@ * | 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 @@ -17,7 +17,7 @@ // Not in a class due to circular dependancy hell. static std::string permchannelsconf; -static bool WriteDatabase(InspIRCd *ServerInstance) +static bool WriteDatabase() { FILE *f; @@ -43,16 +43,43 @@ static bool WriteDatabase(InspIRCd *ServerInstance) } // Now, let's write. - Channel *c = NULL; - for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) { - c = i->second; + Channel* chan = i->second; + if (!chan->IsModeSet('P')) + continue; - if (c->IsModeSet('P')) + char line[1024]; + const char* items[] = + { + "\n" + }; + + int lpos = 0, item = 0, ipos = 0; + while (lpos < 1022 && item < 7) { - fprintf(f, "\n", c->name.c_str(), c->topic.c_str(), c->ChanModes(true)); + char c = items[item][ipos++]; + if (c == 0) + { + // end of this string; hop to next string, insert a quote + item++; + ipos = 0; + c = '"'; + } + else if (c == '\\' || c == '"') + { + line[lpos++] = '\\'; + } + line[lpos++] = c; } + line[--lpos] = 0; + fputs(line, f); } int write_error = 0; @@ -61,7 +88,7 @@ static bool WriteDatabase(InspIRCd *ServerInstance) if (write_error) { ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot write to new database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot write to new db: %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new db: %s (%d)", strerror(errno), errno); return false; } @@ -69,7 +96,7 @@ static bool WriteDatabase(InspIRCd *ServerInstance) if (rename(tempname.c_str(), permchannelsconf.c_str()) < 0) { ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot move new to old database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); return false; } @@ -83,16 +110,10 @@ static bool WriteDatabase(InspIRCd *ServerInstance) class PermChannel : public ModeHandler { public: - PermChannel(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { } + 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')) @@ -100,7 +121,7 @@ class PermChannel : public ModeHandler channel->SetMode('P',true); // Save permchannels db if needed. - WriteDatabase(ServerInstance); + WriteDatabase(); return MODEACTION_ALLOW; } } @@ -108,7 +129,7 @@ class PermChannel : public ModeHandler { if (channel->IsModeSet('P')) { - if (channel->GetUserCounter() == 0 && !IS_FAKE(source)) + if (channel->GetUserCounter() == 0 && !IS_SERVER(source)) { /* * ugh, ugh, UGH! @@ -134,7 +155,7 @@ class PermChannel : public ModeHandler channel->SetMode('P',false); // Save permchannels db if needed. - WriteDatabase(ServerInstance); + WriteDatabase(); return MODEACTION_ALLOW; } } @@ -148,19 +169,18 @@ class ModulePermanentChannels : public Module PermChannel p; public: - ModulePermanentChannels(InspIRCd* Me) : Module(Me), p(Me, this) + ModulePermanentChannels() : p(this) { 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); + Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 4); 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 @@ -174,12 +194,15 @@ public: { 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) @@ -188,15 +211,16 @@ public: * 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()) { @@ -208,7 +232,7 @@ public: if (!c) { - c = new Channel(ServerInstance, channel, ServerInstance->Time()); + c = new Channel(channel, ServerInstance->Time()); if (!topic.empty()) { c->SetTopic(NULL, topic, true); @@ -253,7 +277,7 @@ public: virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) { if (chan && chan->IsModeSet('P')) - WriteDatabase(ServerInstance); + WriteDatabase(); return MOD_RES_PASSTHRU; } @@ -261,12 +285,12 @@ public: virtual void OnPostTopicChange(User*, Channel *c, const std::string&) { if (c->IsModeSet('P')) - WriteDatabase(ServerInstance); + WriteDatabase(); } virtual Version GetVersion() { - return Version("$Id$",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)