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 2970b724104c15d19d1db3f963c4063c3be143dc..0fcd73fe92493c2fd17b60d13f09c3d82e114d1f 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.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,91 +12,70 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
 class ModuleModesOnConnect : public Module
 {
- private:
-
-       ConfigReader *Conf;
-
  public:
-       ModuleModesOnConnect(InspIRCd* Me)
-               : Module(Me)
-       {
-               
-               Conf = new ConfigReader(ServerInstance);
-               Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+       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
+               ServerInstance->Modules->SetPriority(this, PRIORITY_FIRST);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnPostConnect] = List[I_OnRehash] = 1;
-       }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
-       {
-               delete Conf;
-               Conf = new ConfigReader(ServerInstance);
-       }
-       
        virtual ~ModuleModesOnConnect()
        {
-               delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR,API_VERSION);
        }
-       
-       virtual void OnPostConnect(User* user)
+
+       virtual void OnUserConnect(User* user)
        {
                if (!IS_LOCAL(user))
                        return;
 
-               for (int j = 0; j < Conf->Enumerate("connect"); j++)
+               // Backup and zero out the disabled usermodes, so that we can override them here.
+               char save[64];
+               memcpy(save, ServerInstance->Config->DisabledUModes,
+                               sizeof(ServerInstance->Config->DisabledUModes));
+               memset(ServerInstance->Config->DisabledUModes, 0, 64);
+
+               ConfigTag* tag = user->MyClass->config;
+               std::string ThisModes = tag->getString("modes");
+               if (!ThisModes.empty())
                {
-                       std::string hostn = Conf->ReadValue("connect","allow",j);
-                       if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
+                       std::string buf;
+                       std::stringstream ss(ThisModes);
+
+                       std::vector<std::string> tokens;
+
+                       // split ThisUserModes into modes and mode params
+                       while (ss >> buf)
+                               tokens.push_back(buf);
+
+                       std::vector<std::string> modes;
+                       modes.push_back(user->nick);
+                       modes.push_back(tokens[0]);
+
+                       if (tokens.size() > 1)
                        {
-                               std::string ThisModes = Conf->ReadValue("connect","modes",j);
-                               if (!ThisModes.empty())
+                               // process mode params
+                               for (unsigned int k = 1; k < tokens.size(); k++)
                                {
-                                       std::string buf;
-                                       stringstream ss(ThisModes);
-
-                                       vector<string> tokens;
-
-                                       // split ThisUserModes 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;
-                                       modes[1] = tokens[0].c_str();
-
-                                       if (tokens.size() > 1)
-                                       {
-                                               // process mode params
-                                               int i = 2;
-                                               for (unsigned int k = 1; k < tokens.size(); k++)
-                                               {
-                                                       modes[i] = tokens[k].c_str();
-                                                       i++;
-                                               }
-                                       }
-
-                                       ServerInstance->Parser->CallHandler("MODE", modes, size, user);
-                                       delete [] modes;
+                                       modes.push_back(tokens[k]);
                                }
-                               break;
                        }
+
+                       ServerInstance->Parser->CallHandler("MODE", modes, user);
                }
+
+               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
        }
 };