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 e7ff2c584c706a5b2b600c2283f3df011c434ebc..2489f2a1f3166298627992041c495fc27f600061 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -54,6 +54,12 @@ class ModuleModesOnConnect : public Module
                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);
        }
 };