pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 19:33:11 +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_info.cpp
+21 -21
View File
@@ -49,9 +49,9 @@ class CommandCSInfo : public Command
if (ci->HasFlag(CI_FORBIDDEN))
{
if (is_oper(u) && !ci->forbidby.empty())
notice_lang(Config.s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan.c_str(), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : getstring(u, NO_REASON));
notice_lang(Config->s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan.c_str(), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : getstring(u, NO_REASON));
else
notice_lang(Config.s_ChanServ, u, CHAN_X_FORBIDDEN, chan.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_X_FORBIDDEN, chan.c_str());
return MOD_CONT;
}
@@ -60,32 +60,32 @@ class CommandCSInfo : public Command
if (has_auspex && check_access(u, ci, CA_INFO))
show_all = true;
notice_lang(Config.s_ChanServ, u, CHAN_INFO_HEADER, chan.c_str());
notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_FOUNDER, ci->founder->display.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_HEADER, chan.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_NO_FOUNDER, ci->founder->display.c_str());
if (show_all && ci->successor)
notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR, ci->successor->display.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR, ci->successor->display.c_str());
notice_lang(Config.s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc.c_str());
tm = localtime(&ci->time_registered);
strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(Config.s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf);
notice_lang(Config->s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf);
tm = localtime(&ci->last_used);
strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_USED, buf);
notice_lang(Config->s_ChanServ, u, CHAN_INFO_LAST_USED, buf);
if (!ci->last_topic.empty() && (show_all || (!ci->HasMLock(CMODE_SECRET, true) && (!ci->c || !ci->c->HasMode(CMODE_SECRET)))))
{
notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic.c_str());
notice_lang(Config.s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str());
}
if (!ci->entry_message.empty() && show_all)
notice_lang(Config.s_ChanServ, u, CHAN_INFO_ENTRYMSG, ci->entry_message.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_ENTRYMSG, ci->entry_message.c_str());
if (show_all)
{
notice_lang(Config.s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype);
notice_lang(Config->s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype);
Anope::string optbuf;
CheckOptStr(optbuf, CI_KEEPTOPIC, getstring(u, CHAN_INFO_OPT_KEEPTOPIC), ci, u->Account());
@@ -104,22 +104,22 @@ class CommandCSInfo : public Command
CheckOptStr(optbuf, CI_XOP, getstring(u, CHAN_INFO_OPT_XOP), ci, u->Account());
CheckOptStr(optbuf, CI_PERSIST, getstring(u, CHAN_INFO_OPT_PERSIST), ci, u->Account());
notice_lang(Config.s_ChanServ, u, CHAN_INFO_OPTIONS, optbuf.empty() ? getstring(u, CHAN_INFO_OPT_NONE) : optbuf.c_str());
notice_lang(Config.s_ChanServ, u, CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1).c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_OPTIONS, optbuf.empty() ? getstring(u, CHAN_INFO_OPT_NONE) : optbuf.c_str());
notice_lang(Config->s_ChanServ, u, CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1).c_str());
// XXX: we could just as easily (and tidily) merge this in with the flags display above.
if (ci->HasFlag(CI_NO_EXPIRE))
notice_lang(Config.s_ChanServ, u, CHAN_INFO_NO_EXPIRE);
notice_lang(Config->s_ChanServ, u, CHAN_INFO_NO_EXPIRE);
else
{
expt = ci->last_used + Config.CSExpire;
expt = ci->last_used + Config->CSExpire;
tm = localtime(&expt);
strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(Config.s_ChanServ, u, CHAN_INFO_EXPIRE, buf);
notice_lang(Config->s_ChanServ, u, CHAN_INFO_EXPIRE, buf);
}
}
if (ci->HasFlag(CI_SUSPENDED))
notice_lang(Config.s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : getstring(u, NO_REASON));
notice_lang(Config->s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : getstring(u, NO_REASON));
FOREACH_MOD(I_OnChanInfo, OnChanInfo(u, ci, show_all));
@@ -128,19 +128,19 @@ class CommandCSInfo : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_INFO);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_INFO);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX);
syntax_error(Config->s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_ChanServ, u, CHAN_HELP_CMD_INFO);
notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_INFO);
}
};