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 f0c8dfa0711fec32cf05781ba13f62d9ab65d99d..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>
@@ -16,22 +16,10 @@
 
 using namespace std;
 
-// Hostname ModesOnOper (+x mode) module for inspircd.
-// version 1.0.0.1 by brain (C. J. Edwards) Mar 2004.
-//
-// When loaded this module will automatically set the
-// +x mode on all connecting clients.
-//
-// Setting +x on a client causes the module to change the
-// dhost entry (displayed host) for each user who has the
-// mode, ModesOnOper their host. Unlike unreal, the algorithm
-// is non-reversible as uncloaked hosts are passed along
-// the server->server link, and all encoding of hosts is
-// done locally on the server by this module.
-
 #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 */
@@ -44,16 +32,27 @@ class ModuleModesOnOper : public Module
        ConfigReader *Conf;
 
  public:
-       ModuleModesOnOper()
+       ModuleModesOnOper(Server* Me)
+               : Module::Module(Me)
+       {
+               Srv = Me;
+               Conf = new ConfigReader;
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnPostOper] = List[I_OnRehash] = 1;
+       }
+
+       virtual void OnRehash(const std::string &parameter)
        {
-               Srv = new Server;
+               DELETE(Conf);
                Conf = new ConfigReader;
        }
        
        virtual ~ModuleModesOnOper()
        {
-               delete Conf;
-               delete Srv;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()
@@ -61,17 +60,20 @@ class ModuleModesOnOper : public Module
                return Version(1,0,0,1,VF_VENDOR);
        }
        
-       virtual void OnOper(userrec* user)
+       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];
@@ -79,9 +81,9 @@ class ModuleModesOnOper : public Module
                                        modes[1] = (char*)ThisOpersModes.c_str();
                                        Srv->SendMode(modes,2,user);
                                }
-                                break;
-                        }
-                }
+                               break;
+                       }
+               }
        }
 };
 
@@ -98,9 +100,9 @@ class ModuleModesOnOperFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleModesOnOper;
+               return new ModuleModesOnOper(Me);
        }
        
 };