Change /CHECK <#channel> to correctly report timestamp since it might have been TS...

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

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index db26b3f889ee6a0a414eba0cd5ebd9a27e17d808..f4939c00e96e1e3b876b5ef5f401adeee8e6dea4 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,7 +15,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
 
@@ -68,9 +67,9 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
        bursting = false;
        VersionString.clear();
        ServerUserCount = ServerOperCount = 0;
-       this->SetNextPingTime(time(NULL) + Utils->PingFreq);
+       this->SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
        this->SetPingFlag();
-       DupError = false;
+       Warned = DupError = false;
        StartBurst = rtt = 0;
 
        timeval t;
@@ -148,8 +147,7 @@ void TreeServer::FinishBurst()
        gettimeofday(&t, NULL);
        long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
        unsigned long bursttime = ts - this->StartBurst;
-       ServerInstance->SNO->WriteToSnoMask('l', "Received end of netburst from \2%s\2 (burst time: %lu %s)", ServerName.c_str(),
-                                               (bursttime > 1000 ? bursttime / 1000 : bursttime), (bursttime > 1000 ? "secs" : "msecs"));
+       ServerInstance->SNO->WriteToSnoMask('l', "Received end of netburst from \2%s\2 (burst time: %lu %s)", ServerName.c_str(), (bursttime > 1000 ? bursttime / 1000 : bursttime), (bursttime > 1000 ? "secs" : "msecs"));
        Event rmode((char*)ServerName.c_str(),  (Module*)Utils->Creator, "new_server");
        rmode.Send(ServerInstance);
 }
@@ -187,9 +185,9 @@ int TreeServer::QuitUsers(const std::string &reason)
                if (!IS_LOCAL(a))
                {
                        if (ServerInstance->Config->HideSplits)
-                               User::QuitUser(ServerInstance, a, "*.net *.split", reason_s);
+                               ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s);
                        else
-                               User::QuitUser(ServerInstance, a, reason_s);
+                               ServerInstance->Users->QuitUser(a, reason_s);
 
                        if (this->Utils->quiet_bursts)
                                ServerInstance->GlobalCulls.MakeSilent(a);