Omit the server name internally when building a /STATS reply and prepend it later

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

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 5e154feea5ed7423d8d4294baa2dd66ec25d683f..c72f88faa404f1a4436056719511406181c390f5 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -126,7 +126,7 @@ class CommandCheck : public Command
                        user->SendText(checkstr + " realname " + targuser->fullname);
                        user->SendText(checkstr + " modes +" + targuser->FormatModes());
                        user->SendText(checkstr + " snomasks " + GetSnomasks(targuser));
-                       user->SendText(checkstr + " server " + targuser->server);
+                       user->SendText(checkstr + " server " + targuser->server->GetName());
                        user->SendText(checkstr + " uid " + targuser->uuid);
                        user->SendText(checkstr + " signon " + timestring(targuser->signon));
                        user->SendText(checkstr + " nickts " + timestring(targuser->age));
@@ -180,8 +180,8 @@ class CommandCheck : public Command
 
                        if (loctarg)
                        {
-                               user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa));
-                               user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(loctarg->server_sa));
+                               user->SendText(checkstr + " clientaddr " + loctarg->client_sa.str());
+                               user->SendText(checkstr + " serveraddr " + loctarg->server_sa.str());
 
                                std::string classname = loctarg->GetClass()->name;
                                if (!classname.empty())
@@ -192,7 +192,7 @@ class CommandCheck : public Command
 
                        for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
                        {
-                               Channel* c = *i;
+                               Channel* c = (*i)->chan;
                                chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" ");
                        }