Move all of the xline stuff into class XLineManager, make an instance of it in class InspIRCd and use it

(eliminates another extern)


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4878 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 6 insertions, 6 deletions

diff --git a/src/users.cpp b/src/users.cpp
index 4529a3484..938557b59 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -894,10 +894,10 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 		userrec::QuitUser(Instance, _new,"Server is full");
 		return;
 	}
-	char* e = matches_exception(ipaddr);
+	char* e = Instance->XLines->matches_exception(ipaddr);
 	if (!e)
 	{
-		char* r = matches_zline(ipaddr);
+		char* r = Instance->XLines->matches_zline(ipaddr);
 		if (r)
 		{
 			char reason[MAXBUF];
@@ -991,11 +991,11 @@ void userrec::FullConnect(CullList* Goners)
 
 	char match_against[MAXBUF];
 	snprintf(match_against,MAXBUF,"%s@%s", this->ident, this->host);
-	char* e = matches_exception(match_against);
+	char* e = ServerInstance->XLines->matches_exception(match_against);
 
 	if (!e)
 	{
-		char* r = matches_gline(match_against);
+		char* r = ServerInstance->XLines->matches_gline(match_against);
 		
 		if (r)
 		{
@@ -1005,7 +1005,7 @@ void userrec::FullConnect(CullList* Goners)
 			return;
 		}
 		
-		r = matches_kline(match_against);
+		r = ServerInstance->XLines->matches_kline(match_against);
 		
 		if (r)
 		{
@@ -1092,7 +1092,7 @@ bool userrec::ForceNickChange(const char* newnick)
 		return false;
 	}
 	
-	if (matches_qline(newnick))
+	if (ServerInstance->XLines->matches_qline(newnick))
 	{
 		ServerInstance->stats->statsCollisions++;
 		return false;