AMD64 warning 'fix' which tested fine when I added it seems to now...stop things...

[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 7bfc67f6b168cff4e5a14d33319fa847cec3eeef..d99a7ad8ae19c35e80764589292747b7da4f71ca 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -31,16 +31,27 @@ class ModuleModesOnOper : public Module
        ConfigReader *Conf;
 
  public:
-       ModuleModesOnOper()
+       ModuleModesOnOper(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
+               Conf = new ConfigReader;
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnPostOper] = List[I_OnRehash] = 1;
+       }
+
+       virtual void OnRehash(const std::string &parameter)
+       {
+               delete Conf;
                Conf = new ConfigReader;
        }
        
        virtual ~ModuleModesOnOper()
        {
                delete Conf;
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -48,7 +59,7 @@ class ModuleModesOnOper : public Module
                return Version(1,0,0,1,VF_VENDOR);
        }
        
-       virtual void OnOper(userrec* user, std::string opertype)
+       virtual void OnPostOper(userrec* user, const std::string &opertype)
        {
                // 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
@@ -59,6 +70,9 @@ class ModuleModesOnOper : public Module
                         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];
@@ -85,9 +99,9 @@ class ModuleModesOnOperFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleModesOnOper;
+               return new ModuleModesOnOper(Me);
        }
        
 };