pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 16:56:37 +02:00
Code Activity

Rewrote the config reader to better handle invalid configs.

Browse Source 
This prevents Anope from exploding when /os reload has errors.
This commit is contained in:
Adam
2010-08-17 19:27:37 -04:00
parent 2575008baa
commit e65d8b2f3d
195 changed files with 3133 additions and 3249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/bs_set.cpp
+37 -37
View File
@@ -30,7 +30,7 @@ class CommandBSSet : public Command
if (readonly)
{
notice_lang(Config.s_BotServ, u, BOT_SET_DISABLED);
notice_lang(Config->s_BotServ, u, BOT_SET_DISABLED);
return MOD_CONT;
}
@@ -40,28 +40,28 @@ class CommandBSSet : public Command
if (!(bi = findbot(chan)))
{
notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, chan.c_str());
notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, chan.c_str());
return MOD_CONT;
}
if (value.equals_ci("ON"))
{
bi->SetFlag(BI_PRIVATE);
notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick.c_str());
}
else if (value.equals_ci("OFF"))
{
bi->UnsetFlag(BI_PRIVATE);
notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
return MOD_CONT;
}
else if (!(ci = cs_findchan(chan)))
notice_lang(Config.s_BotServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
notice_lang(Config->s_BotServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
notice_lang(Config.s_BotServ, u, ACCESS_DENIED);
notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
else
{
if (option.equals_ci("DONTKICKOPS"))
@@ -69,60 +69,60 @@ class CommandBSSet : public Command
if (value.equals_ci("ON"))
{
ci->botflags.SetFlag(BS_DONTKICKOPS);
notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name.c_str());
}
else if (value.equals_ci("OFF"))
{
ci->botflags.UnsetFlag(BS_DONTKICKOPS);
notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX);
}
else if (option.equals_ci("DONTKICKVOICES"))
{
if (value.equals_ci("ON"))
{
ci->botflags.SetFlag(BS_DONTKICKVOICES);
notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str());
}
else if (value.equals_ci("OFF"))
{
ci->botflags.UnsetFlag(BS_DONTKICKVOICES);
notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX);
}
else if (option.equals_ci("FANTASY"))
{
if (value.equals_ci("ON"))
{
ci->botflags.SetFlag(BS_FANTASY);
notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str());
}
else if (value.equals_ci("OFF"))
{
ci->botflags.UnsetFlag(BS_FANTASY);
notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX);
}
else if (option.equals_ci("GREET"))
{
if (value.equals_ci("ON"))
{
ci->botflags.SetFlag(BS_GREET);
notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str());
}
else if (value.equals_ci("OFF"))
{
ci->botflags.UnsetFlag(BS_GREET);
notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX);
}
else if (u->Account()->HasCommand("botserv/set/nobot") && option.equals_ci("NOBOT"))
{
@@ -131,33 +131,33 @@ class CommandBSSet : public Command
ci->botflags.SetFlag(BS_NOBOT);
if (ci->bi)
ci->bi->UnAssign(u, ci);
notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str());
}
else if (value.equals_ci("OFF"))
{
ci->botflags.UnsetFlag(BS_NOBOT);
notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX);
}
else if (option.equals_ci("SYMBIOSIS"))
{
if (value.equals_ci("ON"))
{
ci->botflags.SetFlag(BS_SYMBIOSIS);
notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str());
}
else if (value.equals_ci("OFF"))
{
ci->botflags.UnsetFlag(BS_SYMBIOSIS);
notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str());
notice_lang(Config->s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str());
}
else
syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX);
}
else
notice_help(Config.s_BotServ, u, BOT_SET_UNKNOWN, option.c_str());
notice_help(Config->s_BotServ, u, BOT_SET_UNKNOWN, option.c_str());
}
return MOD_CONT;
}
@@ -166,24 +166,24 @@ class CommandBSSet : public Command
{
if (subcommand.empty())
{
notice_help(Config.s_BotServ, u, BOT_HELP_SET);
notice_help(Config->s_BotServ, u, BOT_HELP_SET);
if (u->Account() && u->Account()->IsServicesOper())
notice_help(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET);
notice_help(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET);
}
else if (subcommand.equals_ci("DONTKICKOPS"))
notice_help(Config.s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
notice_help(Config->s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
else if (subcommand.equals_ci("DONTKICKVOICES"))
notice_help(Config.s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
notice_help(Config->s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
else if (subcommand.equals_ci("FANTASY"))
notice_help(Config.s_BotServ, u, BOT_HELP_SET_FANTASY);
notice_help(Config->s_BotServ, u, BOT_HELP_SET_FANTASY);
else if (subcommand.equals_ci("GREET"))
notice_help(Config.s_BotServ, u, BOT_HELP_SET_GREET);
notice_help(Config->s_BotServ, u, BOT_HELP_SET_GREET);
else if (subcommand.equals_ci("SYMBIOSIS"))
notice_lang(Config.s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, Config.s_ChanServ.c_str());
notice_lang(Config->s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, Config->s_ChanServ.c_str());
else if (subcommand.equals_ci("NOBOT"))
notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
else if (subcommand.equals_ci("PRIVATE"))
notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
else
return false;
@@ -192,12 +192,12 @@ class CommandBSSet : public Command
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_BotServ, u, "SET", BOT_SET_SYNTAX);
syntax_error(Config->s_BotServ, u, "SET", BOT_SET_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_SET);
notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_SET);
}
};