Gah, im forgetting to SetMode!

[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 628f0a40d14193961b65affc1cf980543bc9b9d4..4cf360e2a90618391f274595ed9a1d4b5b5d32f9 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>
@@ -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 */
@@ -40,12 +41,18 @@ class ModuleModesOnOper : public Module
 
        void Implements(char* List)
        {
-               List[I_OnOper] = 1;
+               List[I_OnPostOper] = List[I_OnRehash] = 1;
+       }
+
+       virtual void OnRehash(const std::string &parameter)
+       {
+               DELETE(Conf);
+               Conf = new ConfigReader;
        }
        
        virtual ~ModuleModesOnOper()
        {
-               delete Conf;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()
@@ -53,17 +60,20 @@ 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
                // 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];
@@ -71,9 +81,9 @@ class ModuleModesOnOper : public Module
                                        modes[1] = (char*)ThisOpersModes.c_str();
                                        Srv->SendMode(modes,2,user);
                                }
-                                break;
-                        }
-                }
+                               break;
+                       }
+               }
        }
 };