All modules which implement simplemodes (no parameters, not a list mode) can now...

[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 d99a7ad8ae19c35e80764589292747b7da4f71ca..4526b05d37e6f7501904e01ce5c975d5ba63a8c7 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -19,6 +19,7 @@ using namespace std;
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
+#include "inspircd.h"
 #include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
@@ -27,15 +28,15 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-       Server *Srv;
+       
        ConfigReader *Conf;
 
  public:
-       ModuleModesOnOper(Server* Me)
+       ModuleModesOnOper(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader;
+               
+               Conf = new ConfigReader(ServerInstance);
        }
 
        void Implements(char* List)
@@ -45,13 +46,13 @@ class ModuleModesOnOper : public Module
 
        virtual void OnRehash(const std::string &parameter)
        {
-               delete Conf;
-               Conf = new ConfigReader;
+               DELETE(Conf);
+               Conf = new ConfigReader(ServerInstance);
        }
        
        virtual ~ModuleModesOnOper()
        {
-               delete Conf;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()
@@ -64,25 +65,25 @@ class ModuleModesOnOper : public Module
                // 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 typen = Conf->ReadValue("type","name",j);
-                        if (!strcmp(typen.c_str(),user->oper))
-                        {
-                                std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
+               for (int j =0; j < Conf->Enumerate("type"); j++)
+               {
+                       std::string typen = Conf->ReadValue("type","name",j);
+                       if (!strcmp(typen.c_str(),user->oper))
+                       {
+                               std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
                                char first = *(ThisOpersModes.c_str());
                                if ((first != '+') && (first != '-'))
                                        ThisOpersModes = "+" + ThisOpersModes;
                                if (ThisOpersModes != "")
                                {
-                                       char* modes[2];
+                                       const char* modes[2];
                                        modes[0] = user->nick;
-                                       modes[1] = (char*)ThisOpersModes.c_str();
-                                       Srv->SendMode(modes,2,user);
+                                       modes[1] = ThisOpersModes.c_str();
+                                       ServerInstance->SendMode(modes,2,user);
                                }
-                                break;
-                        }
-                }
+                               break;
+                       }
+               }
        }
 };
 
@@ -99,7 +100,7 @@ class ModuleModesOnOperFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleModesOnOper(Me);
        }