summaryrefslogtreecommitdiff
path: root/src/operserv.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-04-25 03:16:57 -0400
committerAdam <Adam@anope.org>2011-05-16 04:07:56 -0400
commit076ebafa1b4cc935c466c615b94eaac415af9a67 (patch)
treedbc8b0f9e7b6f954569c13ad35598f5ebe8a081d /src/operserv.cpp
parent6922bd239c778e8f6f2081476ce20b9426c515ad (diff)
Moved some global functions to be member functions and misc cleanup
Diffstat (limited to 'src/operserv.cpp')
-rw-r--r--src/operserv.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/operserv.cpp b/src/operserv.cpp
index 44f62e48c..6ddaeeffb 100644
--- a/src/operserv.cpp
+++ b/src/operserv.cpp
@@ -374,7 +374,7 @@ void SGLineManager::Del(XLine *x)
void SGLineManager::OnMatch(User *u, XLine *x)
{
if (u)
- kill_user(Config->s_OperServ, u, x->Reason);
+ u->Kill(Config->s_OperServ, x->Reason);
ircdproto->SendAkill(u, x);
}
@@ -413,7 +413,7 @@ XLine *SNLineManager::Add(const Anope::string &mask, const Anope::string &creato
++it;
if (!user->HasMode(UMODE_OPER) && user->server != Me && Anope::Match(user->realname, x->Mask))
- kill_user(Config->ServerName, user, rreason);
+ user->Kill(Config->ServerName, rreason);
}
}
@@ -430,7 +430,7 @@ void SNLineManager::OnMatch(User *u, XLine *x)
if (u)
{
Anope::string reason = "G-Lined: " + x->Reason;
- kill_user(Config->s_OperServ, u, reason);
+ u->Kill(Config->s_OperServ, reason);
}
this->Send(u, x);
}
@@ -516,7 +516,7 @@ XLine *SQLineManager::Add(const Anope::string &mask, const Anope::string &creato
++it;
if (!user->HasMode(UMODE_OPER) && user->server != Me && Anope::Match(user->nick, x->Mask))
- kill_user(Config->ServerName, user, rreason);
+ user->Kill(Config->ServerName, rreason);
}
}
}
@@ -537,10 +537,10 @@ void SQLineManager::OnMatch(User *u, XLine *x)
if (u)
{
Anope::string reason = "Q-Lined: " + x->Reason;
- kill_user(Config->s_OperServ, u, reason);
+ u->Kill(Config->s_OperServ, reason);
}
- ircdproto->SendSQLine(u, x);
+ this->Send(u, x);
}
void SQLineManager::OnExpire(XLine *x)
@@ -600,7 +600,7 @@ void SZLineManager::OnMatch(User *u, XLine *x)
if (u)
{
Anope::string reason = "Z-Lined: " + x->Reason;
- kill_user(Config->s_OperServ, u, reason);
+ u->Kill(Config->s_OperServ, reason);
}
ircdproto->SendSZLine(u, x);