Rewrite the m_cgiirc configuration handling.

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

diff --git a/src/users.cpp b/src/users.cpp
index d5493164483f4a2fa4c0dde41c04844c7cc907dc..4945cbb21621d9d4fefd848025c74f5ea16b1346 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -494,7 +494,7 @@ void LocalUser::CheckClass(bool clone_count)
                }
        }
 
-       this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
+       this->nping = ServerInstance->Time() + a->GetPingTime();
 }
 
 bool LocalUser::CheckLines(bool doZline)
@@ -539,10 +539,10 @@ void LocalUser::FullConnect()
 
        this->WriteNumeric(RPL_WELCOME, InspIRCd::Format("Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str()));
        this->WriteNumeric(RPL_YOURHOSTIS, InspIRCd::Format("Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH));
-       this->WriteNumeric(RPL_SERVERCREATED, InspIRCd::Format("This server was created %s %s", __TIME__, __DATE__));
+       this->WriteNumeric(RPL_SERVERCREATED, InspIRCd::TimeString(ServerInstance->startup_time, "This server was created %H:%M:%S %b %d %Y"));
 
-       const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
-       this->WriteNumeric(RPL_SERVERVERSION, ServerInstance->Config->ServerName, INSPIRCD_BRANCH, modelist);
+       const TR1NS::array<std::string, 3>& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
+       this->WriteNumeric(RPL_SERVERVERSION, ServerInstance->Config->ServerName, INSPIRCD_BRANCH, modelist[0], modelist[1], modelist[2]);
 
        ServerInstance->ISupport.SendTo(this);
 
@@ -681,10 +681,9 @@ int LocalUser::GetServerPort()
 
 const std::string& User::GetIPString()
 {
-       int port;
        if (cachedip.empty())
        {
-               irc::sockets::satoap(client_sa, cachedip, port);
+               cachedip = client_sa.addr();
                /* IP addresses starting with a : on irc are a Bad Thing (tm) */
                if (cachedip[0] == ':')
                        cachedip.insert(cachedip.begin(),1,'0');