pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 22:26:39 +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_drop.cpp
+18 -18
View File
@@ -30,7 +30,7 @@ class CommandNSDrop : public Command
if (readonly)
{
notice_lang(Config.s_NickServ, u, NICK_DROP_DISABLED);
notice_lang(Config->s_NickServ, u, NICK_DROP_DISABLED);
return MOD_CONT;
}
@@ -40,17 +40,17 @@ class CommandNSDrop : public Command
{
if ((nr = findrequestnick(nick)) && u->Account()->IsServicesOper())
{
if (Config.WallDrop)
if (Config->WallDrop)
ircdproto->SendGlobops(NickServ, "\2%s\2 used DROP on \2%s\2", u->nick.c_str(), nick.c_str());
Alog() << Config.s_NickServ << ": " << u->GetMask() << " dropped nickname " << nr->nick << " (e-mail: " << nr->email << ")";
Alog() << Config->s_NickServ << ": " << u->GetMask() << " dropped nickname " << nr->nick << " (e-mail: " << nr->email << ")";
delete nr;
notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, 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
notice_lang(Config.s_NickServ, u, NICK_NOT_REGISTERED);
notice_lang(Config->s_NickServ, u, NICK_NOT_REGISTERED);
return MOD_CONT;
}
@@ -59,13 +59,13 @@ class CommandNSDrop : public Command
my_nick = na->nick;
if (!is_mine && !u->Account()->HasPriv("nickserv/drop"))
notice_lang(Config.s_NickServ, u, ACCESS_DENIED);
else if (Config.NSSecureAdmins && !is_mine && na->nc->IsServicesOper())
notice_lang(Config.s_NickServ, u, ACCESS_DENIED);
notice_lang(Config->s_NickServ, u, ACCESS_DENIED);
else if (Config->NSSecureAdmins && !is_mine && na->nc->IsServicesOper())
notice_lang(Config->s_NickServ, u, ACCESS_DENIED);
else
{
if (readonly)
notice_lang(Config.s_NickServ, u, READ_ONLY_MODE);
notice_lang(Config->s_NickServ, u, READ_ONLY_MODE);
if (ircd->sqline && na->HasFlag(NS_FORBIDDEN))
{
@@ -73,23 +73,23 @@ class CommandNSDrop : public Command
ircdproto->SendSQLineDel(&x);
}
Alog() << Config.s_NickServ << ": " << u->GetMask() << " dropped nickname " << na->nick << " (group " << na->nc->display << ") (e-mail: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")";
Alog() << Config->s_NickServ << ": " << u->GetMask() << " dropped nickname " << na->nick << " (group " << na->nc->display << ") (e-mail: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")";
delete na;
FOREACH_MOD(I_OnNickDrop, OnNickDrop(!my_nick.empty() ? my_nick : nick));
if (!is_mine)
{
if (Config.WallDrop)
if (Config->WallDrop)
ircdproto->SendGlobops(NickServ, "\2%s\2 used DROP on \2%s\2", u->nick.c_str(), nick.c_str());
notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, nick.c_str());
}
else
{
if (!nick.empty())
notice_lang(Config.s_NickServ, u, NICK_X_DROPPED, nick.c_str());
notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, nick.c_str());
else
notice_lang(Config.s_NickServ, u, NICK_DROPPED);
notice_lang(Config->s_NickServ, u, NICK_DROPPED);
}
}
@@ -99,16 +99,16 @@ class CommandNSDrop : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
if (u->Account() && u->Account()->HasPriv("nickserv/drop"))
notice_help(Config.s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
else
notice_help(Config.s_NickServ, u, NICK_HELP_DROP);
notice_help(Config->s_NickServ, u, NICK_HELP_DROP);
return true;
}
void OnServHelp(User *u)
{
notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_DROP);
notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_DROP);
}
};