mirror of
https://github.com/anope/anope.git
synced 2026-07-05 03:33: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:
+10
-10
@@ -25,7 +25,7 @@ class CommandCSSetXOP : public Command
|
||||
{
|
||||
if (!FindModule("cs_xop"))
|
||||
{
|
||||
notice_lang(Config.s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, "XOP");
|
||||
notice_lang(Config->s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, "XOP");
|
||||
return MOD_CONT;
|
||||
}
|
||||
|
||||
@@ -64,15 +64,15 @@ class CommandCSSetXOP : public Command
|
||||
ci->SetFlag(CI_XOP);
|
||||
}
|
||||
|
||||
Alog() << Config.s_ChanServ << ": " << u->GetMask() << " enabled XOP for " << ci->name;
|
||||
notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_ON, ci->name.c_str());
|
||||
Alog() << Config->s_ChanServ << ": " << u->GetMask() << " enabled XOP for " << ci->name;
|
||||
notice_lang(Config->s_ChanServ, u, CHAN_SET_XOP_ON, ci->name.c_str());
|
||||
}
|
||||
else if (params[1].equals_ci("OFF"))
|
||||
{
|
||||
ci->UnsetFlag(CI_XOP);
|
||||
|
||||
Alog() << Config.s_ChanServ << ": " << u->GetMask() << " disabled XOP for " << ci->name;
|
||||
notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name.c_str());
|
||||
Alog() << Config->s_ChanServ << ": " << u->GetMask() << " disabled XOP for " << ci->name;
|
||||
notice_lang(Config->s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name.c_str());
|
||||
}
|
||||
else
|
||||
this->OnSyntaxError(u, "XOP");
|
||||
@@ -82,18 +82,18 @@ class CommandCSSetXOP : public Command
|
||||
|
||||
bool OnHelp(User *u, const Anope::string &)
|
||||
{
|
||||
notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_XOP, "SET");
|
||||
notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_XOP, "SET");
|
||||
return true;
|
||||
}
|
||||
|
||||
void OnSyntaxError(User *u, const Anope::string &)
|
||||
{
|
||||
syntax_error(Config.s_ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX);
|
||||
syntax_error(Config->s_ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX);
|
||||
}
|
||||
|
||||
void OnServHelp(User *u)
|
||||
{
|
||||
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_SET_XOP);
|
||||
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_XOP);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -106,13 +106,13 @@ class CommandCSSASetXOP : public CommandCSSetXOP
|
||||
|
||||
bool OnHelp(User *u, const Anope::string &)
|
||||
{
|
||||
notice_help(Config.s_ChanServ, u, CHAN_HELP_SET_XOP, "SASET");
|
||||
notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_XOP, "SASET");
|
||||
return true;
|
||||
}
|
||||
|
||||
void OnSyntaxError(User *u, const Anope::string &)
|
||||
{
|
||||
syntax_error(Config.s_ChanServ, u, "SASET XOP", CHAN_SASET_XOP_SYNTAX);
|
||||
syntax_error(Config->s_ChanServ, u, "SASET XOP", CHAN_SASET_XOP_SYNTAX);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user