Fix dccallow to work with files with spaces in their names

[user/henk/code/inspircd.git] / src / modules / m_permchannels.cpp

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 1bcb2ac17aeeedb836a7490856154215774f9214..e86b3cbf6d171dece2453c8e50e110680ad9c980 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -22,9 +22,15 @@
 
 /* $ModDesc: Provides support for channel mode +P to provide permanent channels */
 
+struct ListModeData
+{
+       std::string modes;
+       std::string params;
+};
+
 // Not in a class due to circular dependancy hell.
 static std::string permchannelsconf;
-static bool WriteDatabase()
+static bool WriteDatabase(Module* mod, bool save_listmodes)
 {
        FILE *f;
 
@@ -58,6 +64,44 @@ static bool WriteDatabase()
                if (!chan->IsModeSet('P'))
                        continue;
 
+               std::string chanmodes = chan->ChanModes(true);
+               if (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 += ' ';
+                       }
+
+                       // 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));
+
+                       if (!lm.modes.empty())
+                       {
+                               // Remove the last space
+                               lm.params.erase(lm.params.end()-1);
+
+                               // If there is at least a space in chanmodes (that is, a non-listmode has a parameter)
+                               // insert the listmode mode letters before the space. Otherwise just append them.
+                               std::string::size_type p = chanmodes.find(' ');
+                               if (p == std::string::npos)
+                                       chanmodes += lm.modes;
+                               else
+                                       chanmodes.insert(p, lm.modes);
+
+                               // Append the listmode parameters (the masks themselves)
+                               chanmodes += ' ';
+                               chanmodes += lm.params;
+                       }
+               }
+
                std::string chants = ConvToStr(chan->age);
                std::string topicts = ConvToStr(chan->topicset);
                const char* items[] =
@@ -73,7 +117,7 @@ static bool WriteDatabase()
                        " topicsetby=",
                        chan->setby.c_str(),
                        " modes=",
-                       chan->ChanModes(true),
+                       chanmodes.c_str(),
                        ">\n"
                };
 
@@ -112,12 +156,7 @@ static bool WriteDatabase()
        }
 
 #ifdef _WIN32
-       if (remove(permchannelsconf.c_str()))
-       {
-               ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: 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;
-       }
+       remove(permchannelsconf.c_str());
 #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)
@@ -170,9 +209,12 @@ class ModulePermanentChannels : public Module
 {
        PermChannel p;
        bool dirty;
+       bool loaded;
+       bool save_listmodes;
 public:
 
-       ModulePermanentChannels() : p(this), dirty(false)
+       ModulePermanentChannels()
+               : p(this), dirty(false), loaded(false)
        {
        }
 
@@ -213,7 +255,9 @@ public:
 
        virtual void OnRehash(User *user)
        {
-               permchannelsconf = ServerInstance->Config->ConfValue("permchanneldb")->getString("filename");
+               ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
+               permchannelsconf = tag->getString("filename");
+               save_listmodes = tag->getBool("listmodes");
        }
 
        void LoadDatabase()
@@ -245,6 +289,8 @@ public:
 
                                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)
@@ -296,7 +342,7 @@ public:
        void OnBackgroundTimer(time_t)
        {
                if (dirty)
-                       WriteDatabase();
+                       WriteDatabase(this, save_listmodes);
                dirty = false;
        }
 
@@ -307,8 +353,6 @@ public:
                // to be able to set the modes they provide (e.g.: m_stripcolor is inited after us)
                // Prioritize() is called after all module initialization is complete, consequently
                // all modes are available now
-
-               static bool loaded = false;
                if (loaded)
                        return;
 
@@ -332,6 +376,25 @@ public:
                }
        }
 
+       void ProtoSendMode(void* opaque, TargetTypeFlags type, void* target, const std::vector<std::string>& modes, const std::vector<TranslateType>& translate)
+       {
+               // We never pass an empty modelist but better be sure
+               if (modes.empty())
+                       return;
+
+               ListModeData* lm = static_cast<ListModeData*>(opaque);
+
+               // Append the mode letters without the trailing '+' (for example "IIII", "gg")
+               lm->modes.append(modes[0].begin()+1, modes[0].end());
+
+               // Append the parameters
+               for (std::vector<std::string>::const_iterator i = modes.begin()+1; i != modes.end(); ++i)
+               {
+                       lm->params += *i;
+                       lm->params += ' ';
+               }
+       }
+
        virtual Version GetVersion()
        {
                return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR);