This won't work yet.

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index b945e3238b6589802ae0a6ef28b1ed13ee204ec3..3803a7a9efebeeeea00e209f689b558dd0e71ab3 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -830,10 +830,11 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
        }
 #endif
 
-       New->exempt = (Instance->XLines->matches_exception(New) != NULL);
+       New->exempt = (Instance->XLines->MatchesLine("E",New) != NULL);
        if (!New->exempt)
        {
-               ZLine* r = Instance->XLines->matches_zline(ipaddr);
+               XLine* r = Instance->XLines->MatchesLine("Z",New);
+
                if (r)
                {
                        char reason[MAXBUF];
@@ -941,7 +942,7 @@ void User::FullConnect()
 
        if (!this->exempt)
        {
-               GLine* r = ServerInstance->XLines->matches_gline(this);
+               XLine* r = ServerInstance->XLines->MatchesLine("G",this);
 
                if (r)
                {
@@ -954,7 +955,7 @@ void User::FullConnect()
                        return;
                }
 
-               KLine* n = ServerInstance->XLines->matches_kline(this);
+               XLine* n = ServerInstance->XLines->MatchesLine("K",this);
 
                if (n)
                {
@@ -1064,7 +1065,7 @@ bool User::ForceNickChange(const char* newnick)
                        return false;
                }
 
-               if (ServerInstance->XLines->matches_qline(newnick))
+               if (ServerInstance->XLines->MatchesLine("Q",newnick))
                {
                        ServerInstance->stats->statsCollisions++;
                        return false;