]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_permchannels.cpp
Merge insp20
[user/henk/code/inspircd.git] / src / modules / m_permchannels.cpp
index 0a7dc8ed96b9b2d551fa03cac6b528da4531b50a..a19a184e08bb91d4cdfd05c15581ce99e7815e91 100644 (file)
@@ -19,8 +19,9 @@
 
 
 #include "inspircd.h"
+#include "listmode.h"
+#include <fstream>
 
-/* $ModDesc: Provides support for channel mode +P to provide permanent channels */
 
 struct ListModeData
 {
@@ -28,40 +29,61 @@ struct ListModeData
        std::string params;
 };
 
-// Not in a class due to circular dependancy hell.
-static std::string permchannelsconf;
-static bool WriteDatabase(Module* mod, bool save_listmodes)
+/** Handles the +P channel mode
+ */
+class PermChannel : public ModeHandler
 {
-       FILE *f;
-
-       if (permchannelsconf.empty())
+ public:
+       PermChannel(Module* Creator)
+               : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL)
        {
-               // Fake success.
-               return true;
+               oper = true;
        }
 
-       std::string tempname = permchannelsconf + ".tmp";
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding)
+       {
+               if (adding == channel->IsModeSet(this))
+                       return MODEACTION_DENY;
+
+               channel->SetMode(this, adding);
+               if (!adding)
+                       channel->CheckDestroy();
+
+               return MODEACTION_ALLOW;
+       }
+};
 
+// Not in a class due to circular dependancy hell.
+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 and sync the FD, then rename the file..
-        *              -- w00t
+        * So, let's write to a temporary file, flush it, then rename the file..
+        *     -- w00t
         */
-       f = fopen(tempname.c_str(), "w");
-       if (!f)
+       
+       // If the user has not specified a configuration file then we don't write one.
+       if (permchannelsconf.empty())
+               return true;
+
+       std::string permchannelsnewconf = permchannelsconf + ".tmp";
+       std::ofstream stream(permchannelsnewconf.c_str());
+       if (!stream.is_open())
        {
-               ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot create database! %s (%d)", strerror(errno), errno);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot create database! %s (%d)", strerror(errno), errno);
                ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno);
                return false;
        }
+       
+       stream << "# This file is automatically generated by m_permchannels. Any changes will be overwritten." << std::endl
+               << "<config format=\"xml\">" << std::endl;
 
-       fputs("# Permchannels DB\n# This file is autogenerated; any changes will be overwritten!\n<config format=\"compat\">\n", f);
-       // Now, let's write.
-       std::string line;
        for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
        {
                Channel* chan = i->second;
-               if (!chan->IsModeSet('P'))
+               if (!chan->IsModeSet(permchanmode))
                        continue;
 
                std::string chanmodes = chan->ChanModes(true);
@@ -70,18 +92,13 @@ static bool WriteDatabase(Module* mod, bool save_listmodes)
                        ListModeData lm;
 
                        // Bans are managed by the core, so we have to process them separately
-                       lm.modes = std::string(chan->bans.size(), 'b');
-                       for (BanList::const_iterator j = chan->bans.begin(); j != chan->bans.end(); ++j)
-                       {
-                               lm.params += j->data;
-                               lm.params += ' ';
-                       }
+                       static_cast<ListModeBase*>(*ban)->DoSyncChannel(chan, mod, &lm);
 
                        // All other listmodes are managed by modules, so we need to ask them (call their
                        // OnSyncChannel() handler) to give our ProtoSendMode() a list of modes that are
                        // set on the channel. The ListModeData struct is passed as an opaque pointer
                        // that will be passed back to us by the module handling the mode.
-                       FOREACH_MOD(I_OnSyncChannel, OnSyncChannel(chan, mod, &lm));
+                       FOREACH_MOD(OnSyncChannel, (chan, mod, &lm));
 
                        if (!lm.modes.empty())
                        {
@@ -102,71 +119,35 @@ static bool WriteDatabase(Module* mod, bool save_listmodes)
                        }
                }
 
-               std::string chants = ConvToStr(chan->age);
-               std::string topicts = ConvToStr(chan->topicset);
-               const char* items[] =
-               {
-                       "<permchannels channel=",
-                       chan->name.c_str(),
-                       " ts=",
-                       chants.c_str(),
-                       " topic=",
-                       chan->topic.c_str(),
-                       " topicts=",
-                       topicts.c_str(),
-                       " topicsetby=",
-                       chan->setby.c_str(),
-                       " modes=",
-                       chanmodes.c_str(),
-                       ">\n"
-               };
-
-               line.clear();
-               int item = 0, ipos = 0;
-               while (item < 13)
-               {
-                       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 += '\\';
-                       }
-                       line += c;
-               }
-
-               // Erase last '"'
-               line.erase(line.end()-1);
-               fputs(line.c_str(), f);
+               stream << "<permchannels channel=\"" << ServerConfig::Escape(chan->name)
+                       << "\" ts=\"" << chan->age
+                       << "\" topic=\"" << ServerConfig::Escape(chan->topic)
+                       << "\" topicts=\"" << chan->topicset
+                       << "\" topicsetby=\"" << ServerConfig::Escape(chan->setby)
+                       << "\" modes=\"" << ServerConfig::Escape(chanmodes)
+                       << "\">" << std::endl;
        }
 
-       int write_error = 0;
-       write_error = ferror(f);
-       write_error |= fclose(f);
-       if (write_error)
+       if (stream.fail())
        {
-               ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot write to new database! %s (%d)", strerror(errno), errno);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot write to new database! %s (%d)", strerror(errno), errno);
                ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new db: %s (%d)", strerror(errno), errno);
                return false;
        }
+       stream.close();
 
 #ifdef _WIN32
        if (remove(permchannelsconf.c_str()))
        {
-               ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot remove old database! %s (%d)", strerror(errno), errno);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot remove old database! %s (%d)", strerror(errno), errno);
                ServerInstance->SNO->WriteToSnoMask('a', "database: cannot remove old database: %s (%d)", strerror(errno), errno);
                return false;
        }
 #endif
        // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
-       if (rename(tempname.c_str(), permchannelsconf.c_str()) < 0)
+       if (rename(permchannelsnewconf.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->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot move new to old database! %s (%d)", strerror(errno), errno);
                ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
                return false;
        }
@@ -174,42 +155,6 @@ static bool WriteDatabase(Module* mod, bool save_listmodes)
        return true;
 }
 
-
-
-/** Handles the +P channel mode
- */
-class PermChannel : public ModeHandler
-{
- public:
-       PermChannel(Module* Creator) : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('P'))
-                       {
-                               channel->SetMode('P',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('P'))
-                       {
-                               channel->SetMode(this,false);
-                               if (channel->GetUserCounter() == 0)
-                               {
-                                       channel->DelUser(ServerInstance->FakeClient);
-                               }
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
-};
-
 class ModulePermanentChannels : public Module
 {
        PermChannel p;
@@ -221,11 +166,9 @@ public:
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(p);
-               Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash, I_OnBackgroundTimer };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
                OnRehash(NULL);
        }
@@ -245,7 +188,7 @@ public:
                        {
                                chan_hash::iterator at = iter;
                                iter++;
-                               FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(c));
+                               FOREACH_MOD(OnChannelDelete, (c));
                                ServerInstance->chanlist->erase(at);
                                ServerInstance->GlobalCulls.AddItem(c);
                        }
@@ -256,7 +199,7 @@ public:
                return Module::cull();
        }
 
-       virtual void OnRehash(User *user)
+       void OnRehash(User *user) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
                permchannelsconf = tag->getString("filename");
@@ -274,12 +217,11 @@ public:
                {
                        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()) || (channel.length() > ServerInstance->Config->Limits.ChanMax))
                        {
-                               ServerInstance->Logs->Log("m_permchannels", DEFAULT, "Ignoring permchannels tag with empty or too long channel name (\"" + channel + "\")");
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring permchannels tag with empty or too long channel name (\"" + channel + "\")");
                                continue;
                        }
 
@@ -287,19 +229,23 @@ public:
 
                        if (!c)
                        {
-                               time_t TS = tag->getInt("ts");
-                               c = new Channel(channel, ((TS > 0) ? TS : ServerInstance->Time()));
+                               time_t TS = tag->getInt("ts", ServerInstance->Time(), 1);
+                               c = new Channel(channel, TS);
 
-                               c->SetTopic(NULL, topic, true);
-                               c->setby = tag->getString("topicsetby");
-                               if (c->setby.empty())
-                                       c->setby = ServerInstance->Config->ServerName;
                                unsigned int topicset = tag->getInt("topicts");
-                               // SetTopic() sets the topic TS to now, if there was no topicts saved then don't overwrite that with a 0
-                               if (topicset > 0)
+                               c->topic = tag->getString("topic");
+
+                               if ((topicset != 0) || (!c->topic.empty()))
+                               {
+                                       if (topicset == 0)
+                                               topicset = ServerInstance->Time();
                                        c->topicset = topicset;
+                                       c->setby = tag->getString("topicsetby");
+                                       if (c->setby.empty())
+                                               c->setby = ServerInstance->Config->ServerName;
+                               }
 
-                               ServerInstance->Logs->Log("m_permchannels", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Added %s with topic %s", channel.c_str(), c->topic.c_str());
 
                                if (modes.empty())
                                        continue;
@@ -328,24 +274,24 @@ public:
                }
        }
 
-       virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
+       ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt) CXX11_OVERRIDE
        {
-               if (chan && (chan->IsModeSet('P') || mode == 'P'))
+               if (chan && (chan->IsModeSet(p) || mode == p.GetModeChar()))
                        dirty = true;
 
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnPostTopicChange(User*, Channel *c, const std::string&)
+       void OnPostTopicChange(User*, Channel *c, const std::string&) CXX11_OVERRIDE
        {
-               if (c->IsModeSet('P'))
+               if (c->IsModeSet(p))
                        dirty = true;
        }
 
-       void OnBackgroundTimer(time_t)
+       void OnBackgroundTimer(time_t) CXX11_OVERRIDE
        {
                if (dirty)
-                       WriteDatabase(this, save_listmodes);
+                       WriteDatabase(p, this, save_listmodes);
                dirty = false;
        }
 
@@ -366,7 +312,7 @@ public:
                // Load only when there are no linked servers - we set the TS of the channels we
                // create to the current time, this can lead to desync because spanningtree has
                // no way of knowing what we do
-               ProtoServerList serverlist;
+               ProtocolInterface::ServerList serverlist;
                ServerInstance->PI->GetServerList(serverlist);
                if (serverlist.size() < 2)
                {
@@ -376,7 +322,7 @@ public:
                        }
                        catch (CoreException& e)
                        {
-                               ServerInstance->Logs->Log("m_permchannels", DEFAULT, "Error loading permchannels database: " + std::string(e.GetReason()));
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Error loading permchannels database: " + std::string(e.GetReason()));
                        }
                }
        }
@@ -400,14 +346,14 @@ public:
                }
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR);
        }
 
-       virtual ModResult OnChannelPreDelete(Channel *c)
+       ModResult OnChannelPreDelete(Channel *c) CXX11_OVERRIDE
        {
-               if (c->IsModeSet('P'))
+               if (c->IsModeSet(p))
                        return MOD_RES_DENY;
 
                return MOD_RES_PASSTHRU;