class ModuleModesOnConnect : public Module
{
- private:
-
- ConfigReader *Conf;
-
public:
ModuleModesOnConnect() {
-
- Conf = new ConfigReader;
- 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);
+ ServerInstance->Modules->Attach(I_OnUserConnect, this);
}
-
- virtual void OnRehash(User* user)
+ void Prioritize()
{
- delete Conf;
- Conf = new ConfigReader;
+ // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
+ ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
}
virtual ~ModuleModesOnConnect()
{
- delete Conf;
}
virtual Version GetVersion()
{
- return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR,API_VERSION);
+ return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
}
- virtual void OnUserConnect(User* user)
+ virtual void OnUserConnect(LocalUser* 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++)
+ 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);