Remove VF_SERVICEPROVIDER, prevent heap allocation of ConfigReader

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 3890f82e6626c947e6aabe00a9370580c43c1576..9db0b5b4ad64feb5e6dce64973f7abb0d70fada9 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -17,16 +17,9 @@
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-
-       ConfigReader *Conf;
-
  public:
        ModuleModesOnOper()
-                       {
-
-               Conf = new ConfigReader;
+       {
                Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -34,52 +27,46 @@ class ModuleModesOnOper : public Module
 
        virtual void OnRehash(User* user)
        {
-               delete Conf;
-               Conf = new ConfigReader;
        }
 
        virtual ~ModuleModesOnOper()
        {
-               delete Conf;
        }
 
        virtual Version GetVersion()
        {
-               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR, API_VERSION);
+               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
        }
 
        virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
        {
+               TagIndex::iterator typetag = ServerInstance->Config->opertypes.find(opertype);
+               if (typetag == ServerInstance->Config->opertypes.end())
+                       return;
                // whenever a user opers, go through the oper types, find their <type:modes>,
                // and if they have one apply their modes. The mode string can contain +modes
                // to add modes to the user or -modes to take modes from the user.
-               for (int j =0; j < Conf->Enumerate("type"); j++)
+               std::string ThisOpersModes = typetag->second->getString("modes");
+               if (!ThisOpersModes.empty())
                {
-                       std::string typen = Conf->ReadValue("type","name",j);
-                       if (typen == user->oper)
-                       {
-                               std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-                               if (!ThisOpersModes.empty())
-                               {
-                                       ApplyModes(user, ThisOpersModes);
-                               }
-                               break;
-                       }
+                       ApplyModes(user, ThisOpersModes);
                }
 
                if (!opername.empty()) // if user is local ..
                {
-                       for (int j = 0; j < Conf->Enumerate("oper"); j++)
+                       for (int i = 0;; i++)
                        {
-                               if (opername == Conf->ReadValue("oper", "name", j))
-                               {
-                                       std::string ThisOpersModes = Conf->ReadValue("oper", "modes", j);
-                                       if (!ThisOpersModes.empty())
-                                       {
-                                               ApplyModes(user, ThisOpersModes);
-                                       }
+                               ConfigTag* tag = ServerInstance->Config->ConfValue("oper", i);
+                               if (!tag)
                                        break;
+                               if (tag->getString("name") != opername)
+                                       continue;
+                               ThisOpersModes = tag->getString("modes");
+                               if (!ThisOpersModes.empty())
+                               {
+                                       ApplyModes(user, ThisOpersModes);
                                }
+                               break;
                        }
                }
        }