X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=35901f8d5f751ae26371a7cf97eeaf0e28b0f3d3;hb=06c6e0858e5d053a1d99a25d0dd7039e47ab1285;hp=84e147f7b88979ddf630edbd332d75245c31806f;hpb=575a3126834d3f283f6296e33c8bce94ee7a0f59;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 84e147f7b..35901f8d5 100644
--- 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));
@@ -192,8 +192,12 @@ class CommandCheck : public Command
 
 			for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
 			{
-				Channel* c = *i;
-				chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" ");
+				Membership* memb = *i;
+				Channel* c = memb->chan;
+				char prefix = memb->GetPrefixChar();
+				if (prefix)
+					chliststr.push_back(prefix);
+				chliststr.append(c->name).push_back(' ');
 			}
 
 			std::stringstream dump(chliststr);
@@ -228,9 +232,10 @@ class CommandCheck : public Command
 				/*
 			 	 * Unlike Asuka, I define a clone as coming from the same host. --w00t
 			 	 */
-				user->SendText("%s member %-3lu %s%s (%s@%s) %s ",
-					checkstr.c_str(), ServerInstance->Users->GlobalCloneCount(i->first),
-					targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(),
+				const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first);
+				user->SendText("%s member %-3u %s%s (%s@%s) %s ",
+					checkstr.c_str(), clonecount.global,
+					i->second->GetAllPrefixChars(), i->first->nick.c_str(),
 					i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
 			}
 
@@ -246,7 +251,8 @@ class CommandCheck : public Command
 			long x = 0;
 
 			/* hostname or other */
-			for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
+			const user_hash& users = ServerInstance->Users->GetUsers();
+			for (user_hash::const_iterator a = users.begin(); a != users.end(); ++a)
 			{
 				if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
 				{