Remove spanningtree override of /LUSERS

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / whois.cpp

diff --git a/src/modules/m_spanningtree/whois.cpp b/src/modules/m_spanningtree/whois.cpp
index 7967131826a9db98f9f9667183d57054515db0ae..03fb5f9234e627c76065540ca0cd032b32b2e7dd 100644 (file)
--- a/src/modules/m_spanningtree/whois.cpp
+++ b/src/modules/m_spanningtree/whois.cpp
@@ -12,11 +12,8 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -30,13 +27,13 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 1)
                return true;
-       User* u = this->ServerInstance->FindNick(prefix);
+       User* u = ServerInstance->FindNick(prefix);
        if (u)
        {
                // an incoming request
                if (params.size() == 1)
                {
-                       User* x = this->ServerInstance->FindNick(params[0]);
+                       User* x = ServerInstance->FindNick(params[0]);
                        if ((x) && (IS_LOCAL(x)))
                        {
                                char signon[MAXBUF];
@@ -60,7 +57,7 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
                else if (params.size() == 3)
                {
                        std::string who_did_the_whois = params[0];
-                       User* who_to_send_to = this->ServerInstance->FindNick(who_did_the_whois);
+                       User* who_to_send_to = ServerInstance->FindNick(who_did_the_whois);
                        if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
                        {
                                // an incoming reply to a whois we sent out
@@ -69,7 +66,7 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
                                unsigned long idle = atoi(params[2].c_str());
                                if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
                                {
-                                       do_whois(this->ServerInstance, who_to_send_to, u, signon, idle, nick_whoised.c_str());
+                                       ServerInstance->DoWhois(who_to_send_to, u, signon, idle, nick_whoised.c_str());
                                }
                        }
                        else