* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
{
private:
std::string operChan;
- std::vector<std::string> operChans;
+ 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 string &str, std::vector<std::string> &tokens)
+ int tokenize(const std::string &str, std::vector<std::string> &tokens)
{
// skip delimiters at beginning.
- string::size_type lastPos = str.find_first_not_of(",", 0);
+ std::string::size_type lastPos = str.find_first_not_of(",", 0);
// find first "non-delimiter".
- string::size_type pos = str.find_first_of(",", lastPos);
+ std::string::size_type pos = str.find_first_of(",", lastPos);
- while (string::npos != pos || string::npos != lastPos)
+ while (std::string::npos != pos || std::string::npos != lastPos)
{
// found a token, add it to the vector.
tokens.push_back(str.substr(lastPos, pos - lastPos));
ConfigReader* conf = new ConfigReader(ServerInstance);
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 Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version(1,2,0,1,VF_VENDOR,API_VERSION);
}
- virtual void OnPostOper(User* user, const std::string &opertype)
+ virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
{
if (!IS_LOCAL(user))
return;
for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
- if (ServerInstance->IsChannel(it->c_str()))
- Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", false, ServerInstance->Time(true));
+ if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+ Channel::JoinUser(ServerInstance, 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())
+ {
+ const std::vector<std::string>& list = i->second;
+ for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+ {
+ if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+ {
+ Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+ }
+ }
+ }
}
};