pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 10:56:38 +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/cs_modes.cpp
+36 -36
View File
@@ -42,17 +42,17 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const Anope::string &chan
ci = c->ci;
if (!c)
notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str());
else if (is_same ? !(u2 = u) : !(u2 = finduser(realnick)))
notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, realnick.c_str());
notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, realnick.c_str());
else if (is_same ? !check_access(u, ci, levelself) : !check_access(u, ci, level))
notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
else if (!set && !is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci)))
notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
else if (!set && u2->IsProtected() && !is_same)
notice_lang(Config.s_ChanServ, u, ACCESS_DENIED);
notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
else if (!c->FindUser(u2))
notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
notice_lang(Config->s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
else
{
if (set)
@@ -83,18 +83,18 @@ class CommandCSOp : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_OP);
notice_help(Config->s_ChanServ, u, CHAN_HELP_OP);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "OP", CHAN_OP_SYNTAX);
syntax_error(Config->s_ChanServ, u, "OP", CHAN_OP_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_OP);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_OP);
}
};
@@ -114,18 +114,18 @@ class CommandCSDeOp : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_DEOP);
notice_help(Config->s_ChanServ, u, CHAN_HELP_DEOP);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "DEOP", CHAN_DEOP_SYNTAX);
syntax_error(Config->s_ChanServ, u, "DEOP", CHAN_DEOP_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEOP);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEOP);
}
};
@@ -145,18 +145,18 @@ class CommandCSVoice : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_VOICE);
notice_help(Config->s_ChanServ, u, CHAN_HELP_VOICE);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "VOICE", CHAN_VOICE_SYNTAX);
syntax_error(Config->s_ChanServ, u, "VOICE", CHAN_VOICE_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_VOICE);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_VOICE);
}
};
@@ -176,18 +176,18 @@ class CommandCSDeVoice : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_DEVOICE);
notice_help(Config->s_ChanServ, u, CHAN_HELP_DEVOICE);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "DEVOICE", CHAN_DEVOICE_SYNTAX);
syntax_error(Config->s_ChanServ, u, "DEVOICE", CHAN_DEVOICE_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEVOICE);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEVOICE);
}
};
@@ -212,18 +212,18 @@ class CommandCSHalfOp : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_HALFOP);
notice_help(Config->s_ChanServ, u, CHAN_HELP_HALFOP);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "HALFOP", CHAN_HALFOP_SYNTAX);
syntax_error(Config->s_ChanServ, u, "HALFOP", CHAN_HALFOP_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_HALFOP);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_HALFOP);
}
};
@@ -246,18 +246,18 @@ class CommandCSDeHalfOp : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_DEHALFOP);
notice_help(Config->s_ChanServ, u, CHAN_HELP_DEHALFOP);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "DEHALFOP", CHAN_DEHALFOP_SYNTAX);
syntax_error(Config->s_ChanServ, u, "DEHALFOP", CHAN_DEHALFOP_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP);
}
};
@@ -280,18 +280,18 @@ class CommandCSProtect : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_PROTECT);
notice_help(Config->s_ChanServ, u, CHAN_HELP_PROTECT);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "PROTECT", CHAN_PROTECT_SYNTAX);
syntax_error(Config->s_ChanServ, u, "PROTECT", CHAN_PROTECT_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_PROTECT);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_PROTECT);
}
};
@@ -314,18 +314,18 @@ class CommandCSDeProtect : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_DEPROTECT);
notice_help(Config->s_ChanServ, u, CHAN_HELP_DEPROTECT);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "DEPROTECT", CHAN_DEPROTECT_SYNTAX);
syntax_error(Config->s_ChanServ, u, "DEPROTECT", CHAN_DEPROTECT_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT);
}
};
@@ -348,18 +348,18 @@ class CommandCSOwner : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_OWNER);
notice_help(Config->s_ChanServ, u, CHAN_HELP_OWNER);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "OWNER", CHAN_OWNER_SYNTAX);
syntax_error(Config->s_ChanServ, u, "OWNER", CHAN_OWNER_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_OWNER);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_OWNER);
}
};
@@ -382,18 +382,18 @@ class CommandCSDeOwner : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_ChanServ, u, CHAN_HELP_DEOWNER);
notice_help(Config->s_ChanServ, u, CHAN_HELP_DEOWNER);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "DEOWNER", CHAN_DEOWNER_SYNTAX);
syntax_error(Config->s_ChanServ, u, "DEOWNER", CHAN_DEOWNER_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_DEOWNER);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEOWNER);
}
};