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 598f84e4355c2469fb7087dbb07f2f7224881e3e..9db0b5b4ad64feb5e6dce64973f7abb0d70fada9 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -12,98 +12,91 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-       
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnOper(InspIRCd* Me)
-               : Module(Me)
+       ModuleModesOnOper()
        {
-               
-               Conf = new ConfigReader(ServerInstance);
+               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(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               DELETE(Conf);
-               Conf = new ConfigReader(ServerInstance);
        }
-       
+
        virtual ~ModuleModesOnOper()
        {
-               DELETE(Conf);
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
        }
-       
-       virtual void OnPostOper(userrec* user, const 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 ThisOpersModes = typetag->second->getString("modes");
+               if (!ThisOpersModes.empty())
+               {
+                       ApplyModes(user, ThisOpersModes);
+               }
+
+               if (!opername.empty()) // if user is local ..
                {
-                       std::string typen = Conf->ReadValue("type","name",j);
-                       if (!strcmp(typen.c_str(),user->oper))
+                       for (int i = 0;; i++)
                        {
-                               std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
+                               ConfigTag* tag = ServerInstance->Config->ConfValue("oper", i);
+                               if (!tag)
+                                       break;
+                               if (tag->getString("name") != opername)
+                                       continue;
+                               ThisOpersModes = tag->getString("modes");
                                if (!ThisOpersModes.empty())
                                {
-                                       char first = *(ThisOpersModes.c_str());
-                                       if ((first != '+') && (first != '-'))
-                                               ThisOpersModes = "+" + ThisOpersModes;
-
-                                       std::string buf;
-                                       stringstream ss(ThisOpersModes);
-                                       vector<string> tokens;
-
-                                       // split ThisOperModes into modes and mode params
-                                       while (ss >> buf)
-                                               tokens.push_back(buf);
-
-                                       int size = tokens.size() + 1;
-                                       const char** modes = new const char*[size];
-                                       modes[0] = user->nick;
-
-                                       // process mode params
-                                       int i = 1;
-                                       for (unsigned int k = 0; k < tokens.size(); k++)
-                                       {
-                                               modes[i] = tokens[k].c_str();
-                                               i++;
-                                       }
-
-                                       std::deque<std::string> n;
-                                       Event rmode((char *)&n, NULL, "send_mode_explicit");
-                                       for (unsigned int j = 0; j < tokens.size(); j++)
-                                               n.push_back(modes[j]);
-
-                                       rmode.Send(ServerInstance);
-                                       ServerInstance->SendMode(modes, size, user);
-                                       delete [] modes;
+                                       ApplyModes(user, ThisOpersModes);
                                }
                                break;
                        }
                }
        }
+
+       void ApplyModes(User *u, std::string &smodes)
+       {
+               char first = *(smodes.c_str());
+               if ((first != '+') && (first != '-'))
+                       smodes = "+" + smodes;
+
+               std::string buf;
+               std::stringstream ss(smodes);
+               std::vector<std::string> tokens;
+
+               // 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)