Always deny invite to users below halfop status, move OnUserPreInvite up to above...

[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 ab017b15724e52e9ad573f82cb2280c184770fc5..2489f2a1f3166298627992041c495fc27f600061 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -26,7 +26,7 @@ class ModuleModesOnConnect : public Module
        ModuleModesOnConnect(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                Conf = new ConfigReader(ServerInstance);
                Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -38,22 +38,28 @@ class ModuleModesOnConnect : public Module
                delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
-       
+
        virtual ~ModuleModesOnConnect()
        {
                delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
-       
+
        virtual void OnPostConnect(User* user)
        {
                if (!IS_LOCAL(user))
                        return;
 
+               // 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);
+
                for (int j = 0; j < Conf->Enumerate("connect"); j++)
                {
                        std::string hostn = Conf->ReadValue("connect","allow",j);
@@ -90,6 +96,8 @@ class ModuleModesOnConnect : public Module
                                break;
                        }
                }
+
+               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
        }
 };