Hold reference to the associated ConfigTag inside ConnectClass

[user/henk/code/inspircd.git] / src / modules / m_conn_umodes.cpp

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index f502ea57c6cb2c62bf26d38b5b956d8ef174bc2b..0fcd73fe92493c2fd17b60d13f09c3d82e114d1f 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -17,15 +17,8 @@
 
 class ModuleModesOnConnect : public Module
 {
- private:
-
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnConnect(InspIRCd* Me) : Module(Me)
-       {
-
-               Conf = new ConfigReader(ServerInstance);
+       ModuleModesOnConnect()  {
                Implementation eventlist[] = { I_OnUserConnect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
                // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
@@ -33,20 +26,13 @@ class ModuleModesOnConnect : public Module
        }
 
 
-       virtual void OnRehash(User* user)
-       {
-               delete Conf;
-               Conf = new ConfigReader(ServerInstance);
-       }
-
        virtual ~ModuleModesOnConnect()
        {
-               delete Conf;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR,API_VERSION);
        }
 
        virtual void OnUserConnect(User* user)
@@ -60,41 +46,33 @@ class ModuleModesOnConnect : public Module
                                sizeof(ServerInstance->Config->DisabledUModes));
                memset(ServerInstance->Config->DisabledUModes, 0, 64);
 
-               for (int j = 0; j < Conf->Enumerate("connect"); j++)
+               ConfigTag* tag = user->MyClass->config;
+               std::string ThisModes = tag->getString("modes");
+               if (!ThisModes.empty())
                {
-                       std::string hostn = Conf->ReadValue("connect","allow",j);
-                       /* XXX: Fixme: does not respect port, limit, etc */
-                       if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
-                       {
-                               std::string ThisModes = Conf->ReadValue("connect","modes",j);
-                               if (!ThisModes.empty())
-                               {
-                                       std::string buf;
-                                       std::stringstream ss(ThisModes);
-
-                                       std::vector<std::string> tokens;
+                       std::string buf;
+                       std::stringstream ss(ThisModes);
 
-                                       // split ThisUserModes into modes and mode params
-                                       while (ss >> buf)
-                                               tokens.push_back(buf);
+                       std::vector<std::string> tokens;
 
-                                       std::vector<std::string> modes;
-                                       modes.push_back(user->nick);
-                                       modes.push_back(tokens[0]);
+                       // split ThisUserModes into modes and mode params
+                       while (ss >> buf)
+                               tokens.push_back(buf);
 
-                                       if (tokens.size() > 1)
-                                       {
-                                               // process mode params
-                                               for (unsigned int k = 1; k < tokens.size(); k++)
-                                               {
-                                                       modes.push_back(tokens[k]);
-                                               }
-                                       }
+                       std::vector<std::string> modes;
+                       modes.push_back(user->nick);
+                       modes.push_back(tokens[0]);
 
-                                       ServerInstance->Parser->CallHandler("MODE", modes, user);
+                       if (tokens.size() > 1)
+                       {
+                               // process mode params
+                               for (unsigned int k = 1; k < tokens.size(); k++)
+                               {
+                                       modes.push_back(tokens[k]);
                                }
-                               break;
                        }
+
+                       ServerInstance->Parser->CallHandler("MODE", modes, user);
                }
 
                memcpy(ServerInstance->Config->DisabledUModes, save, 64);