pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-06 14:33:13 +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/ns_info.cpp
+28 -28
View File
@@ -46,21 +46,21 @@ class CommandNSInfo : public Command
NickRequest *nr = findrequestnick(nick);
if (nr)
{
notice_lang(Config.s_NickServ, u, NICK_IS_PREREG);
notice_lang(Config->s_NickServ, u, NICK_IS_PREREG);
if (has_auspex)
notice_lang(Config.s_NickServ, u, NICK_INFO_EMAIL, nr->email.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_EMAIL, nr->email.c_str());
}
else if (nickIsServices(nick, true))
notice_lang(Config.s_NickServ, u, NICK_X_IS_SERVICES, nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_IS_SERVICES, nick.c_str());
else
notice_lang(Config.s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str());
}
else if (na->HasFlag(NS_FORBIDDEN))
{
if (is_oper(u) && !na->last_usermask.empty())
notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick.c_str(), na->last_usermask.c_str(), !na->last_realname.empty() ? na->last_realname.c_str() : getstring(u, NO_REASON));
notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick.c_str(), na->last_usermask.c_str(), !na->last_realname.empty() ? na->last_realname.c_str() : getstring(u, NO_REASON));
else
notice_lang(Config.s_NickServ, u, NICK_X_FORBIDDEN, nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, nick.c_str());
}
else
{
@@ -77,52 +77,52 @@ class CommandNSInfo : public Command
if (has_auspex || (u->Account() && na->nc == u->Account()))
show_hidden = true;
notice_lang(Config.s_NickServ, u, NICK_INFO_REALNAME, na->nick.c_str(), na->last_realname.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_REALNAME, na->nick.c_str(), na->last_realname.c_str());
if (na->nc->IsServicesOper() && (show_hidden || !na->nc->HasFlag(NI_HIDE_STATUS)))
notice_lang(Config.s_NickServ, u, NICK_INFO_SERVICES_OPERTYPE, na->nick.c_str(), na->nc->ot->GetName().c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_SERVICES_OPERTYPE, na->nick.c_str(), na->nc->ot->GetName().c_str());
if (nick_online)
{
if (show_hidden || !na->nc->HasFlag(NI_HIDE_MASK))
notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS_ONLINE, na->last_usermask.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_ADDRESS_ONLINE, na->last_usermask.c_str());
else
notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick.c_str());
}
else
{
if (show_hidden || !na->nc->HasFlag(NI_HIDE_MASK))
notice_lang(Config.s_NickServ, u, NICK_INFO_ADDRESS, na->last_usermask.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_ADDRESS, na->last_usermask.c_str());
}
tm = localtime(&na->time_registered);
strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(Config.s_NickServ, u, NICK_INFO_TIME_REGGED, buf);
notice_lang(Config->s_NickServ, u, NICK_INFO_TIME_REGGED, buf);
if (!nick_online)
{
tm = localtime(&na->last_seen);
strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(Config.s_NickServ, u, NICK_INFO_LAST_SEEN, buf);
notice_lang(Config->s_NickServ, u, NICK_INFO_LAST_SEEN, buf);
}
if (!na->last_quit.empty() && (show_hidden || !na->nc->HasFlag(NI_HIDE_QUIT)))
notice_lang(Config.s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit.c_str());
if (!na->nc->email.empty() && (show_hidden || !na->nc->HasFlag(NI_HIDE_EMAIL)))
notice_lang(Config.s_NickServ, u, NICK_INFO_EMAIL, na->nc->email.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_EMAIL, na->nc->email.c_str());
if (show_hidden)
{
if (!Config.s_HostServ.empty() && ircd->vhost && na->hostinfo.HasVhost())
if (!Config->s_HostServ.empty() && ircd->vhost && na->hostinfo.HasVhost())
{
if (ircd->vident && !na->hostinfo.GetIdent().empty())
notice_lang(Config.s_NickServ, u, NICK_INFO_VHOST2, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_VHOST2, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str());
else
notice_lang(Config.s_NickServ, u, NICK_INFO_VHOST, na->hostinfo.GetHost().c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_VHOST, na->hostinfo.GetHost().c_str());
}
if (!na->nc->greet.empty())
notice_lang(Config.s_NickServ, u, NICK_INFO_GREET, na->nc->greet.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_GREET, na->nc->greet.c_str());
Anope::string optbuf;
@@ -132,24 +132,24 @@ class CommandNSInfo : public Command
CheckOptStr(optbuf, NI_MSG, getstring(u, NICK_INFO_OPT_MSG), na->nc);
CheckOptStr(optbuf, NI_AUTOOP, getstring(u, NICK_INFO_OPT_AUTOOP), na->nc);
notice_lang(Config.s_NickServ, u, NICK_INFO_OPTIONS, optbuf.empty() ? getstring(u, NICK_INFO_OPT_NONE) : optbuf.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_OPTIONS, optbuf.empty() ? getstring(u, NICK_INFO_OPT_NONE) : optbuf.c_str());
if (na->nc->HasFlag(NI_SUSPENDED))
{
if (!na->last_quit.empty())
notice_lang(Config.s_NickServ, u, NICK_INFO_SUSPENDED, na->last_quit.c_str());
notice_lang(Config->s_NickServ, u, NICK_INFO_SUSPENDED, na->last_quit.c_str());
else
notice_lang(Config.s_NickServ, u, NICK_INFO_SUSPENDED_NO_REASON);
notice_lang(Config->s_NickServ, u, NICK_INFO_SUSPENDED_NO_REASON);
}
if (na->HasFlag(NS_NO_EXPIRE))
notice_lang(Config.s_NickServ, u, NICK_INFO_NO_EXPIRE);
notice_lang(Config->s_NickServ, u, NICK_INFO_NO_EXPIRE);
else
{
expt = na->last_seen + Config.NSExpire;
expt = na->last_seen + Config->NSExpire;
tm = localtime(&expt);
strftime_lang(buf, sizeof(buf), finduser(na->nick), STRFTIME_DATE_TIME_FORMAT, tm);
notice_lang(Config.s_NickServ, u, NICK_INFO_EXPIRE, buf);
notice_lang(Config->s_NickServ, u, NICK_INFO_EXPIRE, buf);
}
}
@@ -160,19 +160,19 @@ class CommandNSInfo : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config.s_NickServ, u, NICK_HELP_INFO);
notice_help(Config->s_NickServ, u, NICK_HELP_INFO);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
syntax_error(Config.s_NickServ, u, "INFO", NICK_INFO_SYNTAX);
syntax_error(Config->s_NickServ, u, "INFO", NICK_INFO_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_INFO);
notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_INFO);
}
};