* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
private:
std::string operChan;
std::vector<std::string> operChans;
- std::map<std::string, std::vector<std::string> > operTypeChans; // Channels specific to an oper type.
bool override;
int tokenize(const std::string &str, std::vector<std::string> &tokens)
}
public:
- ModuleOperjoin() {
+ ModuleOperjoin()
+ {
OnRehash(NULL);
- Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
virtual void OnRehash(User* user)
{
- ConfigReader* conf = new ConfigReader;
+ ConfigReader conf;
- operChan = conf->ReadValue("operjoin", "channel", 0);
- override = conf->ReadFlag("operjoin", "override", "0", 0);
+ operChan = conf.ReadValue("operjoin", "channel", 0);
+ override = conf.ReadFlag("operjoin", "override", "0", 0);
operChans.clear();
if (!operChan.empty())
tokenize(operChan,operChans);
-
- std::map<std::string, std::vector<std::string> >().swap(operTypeChans);
-
- int olines = conf->Enumerate("type");
- for (int index = 0; index < olines; ++index)
- {
- std::string chanList = conf->ReadValue("type", "autojoin", index);
- if (!chanList.empty())
- {
- tokenize(chanList, operTypeChans[conf->ReadValue("type", "name", index)]);
- }
- }
-
- delete conf;
}
virtual ~ModuleOperjoin()
if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
- std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
-
- if (i != operTypeChans.end())
+ std::string chanList = IS_OPER(user)->getConfig("autojoin");
+ if (!chanList.empty())
{
- const std::vector<std::string>& list = i->second;
- for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+ std::vector<std::string> typechans;
+ tokenize(chanList, typechans);
+ for (std::vector<std::string>::const_iterator it = typechans.begin(); it != typechans.end(); ++it)
{
if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
{
}
}
}
-
};
MODULE_INIT(ModuleOperjoin)