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 c7ca62a69e766584841c830e7cffb93d19ed0c8c..9db0b5b4ad64feb5e6dce64973f7abb0d70fada9 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,113 +2,101 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-       Server *Srv;
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnOper(Server* Me)
-               : Module::Module(Me)
+       ModuleModesOnOper()
        {
-               Srv = Me;
-               Conf = new ConfigReader;
+               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnPostOper] = List[I_OnRehash] = 1;
-       }
 
-       virtual void OnRehash(std::string parameter)
+       virtual void OnRehash(User* user)
        {
-               delete Conf;
-               Conf = new ConfigReader;
        }
-       
+
        virtual ~ModuleModesOnOper()
        {
-               delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
        }
-       
-       virtual void OnPostOper(userrec* user, std::string opertype)
+
+       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 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 != "")
+               std::string ThisOpersModes = typetag->second->getString("modes");
+               if (!ThisOpersModes.empty())
+               {
+                       ApplyModes(user, ThisOpersModes);
+               }
+
+               if (!opername.empty()) // if user is local ..
+               {
+                       for (int i = 0;; i++)
+                       {
+                               ConfigTag* tag = ServerInstance->Config->ConfValue("oper", i);
+                               if (!tag)
+                                       break;
+                               if (tag->getString("name") != opername)
+                                       continue;
+                               ThisOpersModes = tag->getString("modes");
+                               if (!ThisOpersModes.empty())
                                {
-                                       char* modes[2];
-                                       modes[0] = user->nick;
-                                       modes[1] = (char*)ThisOpersModes.c_str();
-                                       Srv->SendMode(modes,2,user);
+                                       ApplyModes(user, ThisOpersModes);
                                }
-                                break;
-                        }
-                }
+                               break;
+                       }
+               }
        }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnOperFactory()
-       {
-       }
-       
-       ~ModuleModesOnOperFactory()
+       void ApplyModes(User *u, std::string &smodes)
        {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleModesOnOper(Me);
-       }
-       
-};
+               char first = *(smodes.c_str());
+               if ((first != '+') && (first != '-'))
+                       smodes = "+" + smodes;
 
+               std::string buf;
+               std::stringstream ss(smodes);
+               std::vector<std::string> tokens;
 
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnOperFactory;
-}
+               // split into modes and mode params
+               while (ss >> buf)
+                       tokens.push_back(buf);
+
+               std::vector<std::string> modes;
+               modes.push_back(u->nick);
+
+               // process mode params
+               for (unsigned int k = 0; k < tokens.size(); k++)
+               {
+                       modes.push_back(tokens[k]);
+               }
+
+               ServerInstance->SendMode(modes, u);
+               ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+       }
+};
 
+MODULE_INIT(ModuleModesOnOper)