mirror of
https://github.com/anope/anope.git
synced 2026-07-07 22:43:12 +02:00
Rewrote the config reader to better handle invalid configs.
This prevents Anope from exploding when /os reload has errors.
This commit is contained in:
@@ -22,9 +22,9 @@ class CommandOSStaff : public Command
|
||||
|
||||
CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms)
|
||||
{
|
||||
notice_lang(Config.s_OperServ, u, OPER_STAFF_LIST_HEADER);
|
||||
notice_lang(Config->s_OperServ, u, OPER_STAFF_LIST_HEADER);
|
||||
|
||||
for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config.Opers.begin(), it_end = Config.Opers.end(); it != it_end; ++it)
|
||||
for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it)
|
||||
{
|
||||
int found = 0;
|
||||
Anope::string nick = it->first, type = it->second;
|
||||
@@ -41,29 +41,29 @@ class CommandOSStaff : public Command
|
||||
{
|
||||
found = 1;
|
||||
if (na->nick.equals_ci(u2->nick))
|
||||
notice_lang(Config.s_OperServ, u, OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str());
|
||||
notice_lang(Config->s_OperServ, u, OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str());
|
||||
else
|
||||
notice_lang(Config.s_OperServ, u, OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str());
|
||||
notice_lang(Config->s_OperServ, u, OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str());
|
||||
}
|
||||
}
|
||||
if (!found)
|
||||
notice_lang(Config.s_OperServ, u, OPER_STAFF_FORMAT, ' ', type.c_str(), na->nick.c_str());
|
||||
notice_lang(Config->s_OperServ, u, OPER_STAFF_FORMAT, ' ', type.c_str(), na->nick.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
notice_lang(Config.s_OperServ, u, END_OF_ANY_LIST, "Staff");
|
||||
notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "Staff");
|
||||
return MOD_CONT;
|
||||
}
|
||||
|
||||
bool OnHelp(User *u, const Anope::string &subcommand)
|
||||
{
|
||||
notice_help(Config.s_OperServ, u, OPER_HELP_STAFF);
|
||||
notice_help(Config->s_OperServ, u, OPER_HELP_STAFF);
|
||||
return true;
|
||||
}
|
||||
|
||||
void OnServHelp(User *u)
|
||||
{
|
||||
notice_lang(Config.s_OperServ, u, OPER_HELP_CMD_STAFF);
|
||||
notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_STAFF);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user