Remove whitespace and minor style changes

[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 a19a184e08bb91d4cdfd05c15581ce99e7815e91..1de07ba070af75825fca3af7b731984af16437ee 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -23,12 +23,6 @@
 #include <fstream>
 
 
-struct ListModeData
-{
-       std::string modes;
-       std::string params;
-};
-
 /** Handles the +P channel mode
  */
 class PermChannel : public ModeHandler
@@ -63,7 +57,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
         * So, let's write to a temporary file, flush it, then rename the file..
         *     -- w00t
         */
-       
+
        // If the user has not specified a configuration file then we don't write one.
        if (permchannelsconf.empty())
                return true;
@@ -76,7 +70,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
                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;
 
@@ -89,33 +83,45 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
                std::string chanmodes = chan->ChanModes(true);
                if (save_listmodes)
                {
-                       ListModeData lm;
+                       std::string modes;
+                       std::string params;
 
-                       // Bans are managed by the core, so we have to process them separately
-                       static_cast<ListModeBase*>(*ban)->DoSyncChannel(chan, mod, &lm);
+                       const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
+                       for (ModeParser::ListModeList::const_iterator j = listmodes.begin(); j != listmodes.end(); ++j)
+                       {
+                               ListModeBase* lm = *j;
+                               ListModeBase::ModeList* list = lm->GetList(chan);
+                               if (!list || list->empty())
+                                       continue;
 
-                       // 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(OnSyncChannel, (chan, mod, &lm));
+                               size_t n = 0;
+                               // Append the parameters
+                               for (ListModeBase::ModeList::const_iterator k = list->begin(); k != list->end(); ++k, n++)
+                               {
+                                       params += k->mask;
+                                       params += ' ';
+                               }
+
+                               // Append the mode letters (for example "IIII", "gg")
+                               modes.append(n, lm->GetModeChar());
+                       }
 
-                       if (!lm.modes.empty())
+                       if (!params.empty())
                        {
                                // Remove the last space
-                               lm.params.erase(lm.params.end()-1);
+                               params.erase(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;
+                                       chanmodes += modes;
                                else
-                                       chanmodes.insert(p, lm.modes);
+                                       chanmodes.insert(p, modes);
 
                                // Append the listmode parameters (the masks themselves)
                                chanmodes += ' ';
-                               chanmodes += lm.params;
+                               chanmodes += params;
                        }
                }
 
@@ -159,20 +165,15 @@ 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)
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(p);
-
-               OnRehash(NULL);
-       }
-
        CullResult cull()
        {
                /*
@@ -199,7 +200,7 @@ public:
                return Module::cull();
        }
 
-       void OnRehash(User *user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
                permchannelsconf = tag->getString("filename");
@@ -302,8 +303,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;
 
@@ -327,25 +326,6 @@ 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 += ' ';
-               }
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR);