1
0
mirror of https://github.com/anope/anope.git synced 2026-07-02 20:43:12 +02:00

Refactor nick enforcement to make a bit more sense.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1747 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
rburchell
2008-11-16 21:06:46 +00:00
parent ffbcff1604
commit b41009db5f
+20 -27
View File
@@ -837,38 +837,31 @@ void cancel_user(User * u)
{
NickAlias *na = u->na;
if (na) {
if (na->status & NS_GUESTED) {
if (ircd->svshold) {
if (ircd->svshold) {
ircdproto->SendSVSHold(na->nick);
} else {
if (ircd->svsnick) {
ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser,
NSEnforcerHost,
"Services Enforcer", "+", ts6_uid_retrieve());
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
} else {
ircdproto->SendSVSKill(s_NickServ, u->nick,
"Killing to enforce nick");
}
}
} else {
if (ircd->svsnick) {
ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser,
NSEnforcerHost,
"Services Enforcer", "+", ts6_uid_retrieve());
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
} else {
ircdproto->SendSVSKill(s_NickServ, u->nick,
"Killing to enforce nick");
}
if (na)
{
if (na->status & NS_GUESTED)
{
if (ircd->svshold)
{
ircdproto->SendSVSHold(na->nick);
}
else if (ircd->svsnick)
{
ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser, NSEnforcerHost, "Services Enforcer", "+", ts6_uid_retrieve());
add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout);
}
else
{
ircdproto->SendSVSKill(s_NickServ, u->nick, "Please do not use a registered nickname without identifying");
}
na->status &= ~NS_TEMPORARY;
na->status |= NS_KILL_HELD;
} else {
}
else
{
na->status &= ~NS_TEMPORARY;
}
del_ns_timeout(na, TO_COLLIDE);
}
}