*/
#include "inspircd.h"
-#include "wildcard.h"
/* $ModDesc: Sets (and unsets) modes on users when they connect */
ConfigReader *Conf;
public:
- ModuleModesOnConnect(InspIRCd* Me)
- : Module(Me)
+ ModuleModesOnConnect(InspIRCd* Me) : Module(Me)
{
Conf = new ConfigReader(ServerInstance);
- Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+ 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, PRIO_FIRST);
}
virtual Version GetVersion()
{
- return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_VENDOR,API_VERSION);
}
- virtual void OnPostConnect(User* user)
+ virtual void OnUserConnect(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, 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);
/* XXX: Fixme: does not respect port, limit, etc */
- if ((match(user->GetIPString(),hostn,true)) || (match(user->host,hostn)))
+ if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
{
std::string ThisModes = Conf->ReadValue("connect","modes",j);
if (!ThisModes.empty())