Modify server counts in /lusers to show number of servers actually visible if you arent an oper and we're hiding ulines

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5739 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 21 insertions, 2 deletions

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index ba4f208d0..ae68115c5 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -4157,14 +4157,33 @@ class ModuleSpanningTree : public Module
 		if (n_users > max_global)
 			max_global = n_users;
 
-		user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-ServerInstance->InvisibleUserCount(),ServerInstance->InvisibleUserCount(),this->CountServs());
+		unsigned int ulined_count = 0;
+		unsigned int ulined_local_count = 0;
+
+		/* If ulined are hidden and we're not an oper, count the number of ulined servers hidden,
+		 * locally and globally (locally means directly connected to us)
+		 */
+		if ((Utils->HideULines) && (!*user->oper))
+		{
+			for (server_hash::iterator q = Utils->serverlist.begin(); q != Utils->serverlist.end(); q++)
+			{
+				if (ServerInstance->ULine(q->second->GetName().c_str()))
+				{
+					ulined_count++;
+					if (q->second->GetParent() == Utils->TreeRoot)
+						ulined_local_count++;
+				}
+			}
+		}
+
+		user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-ServerInstance->InvisibleUserCount(),ServerInstance->InvisibleUserCount(),ulined_count ? this->CountServs() - ulined_count : this->CountServs());
 		if (ServerInstance->OperCount())
 			user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->OperCount());
 		if (ServerInstance->UnregisteredUserCount())
 			user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->UnregisteredUserCount());
 		if (ServerInstance->ChannelCount())
 			user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount());
-		user->WriteServ("254 %s :I have %d clients and %d servers",user->nick,ServerInstance->LocalUserCount(),this->CountLocalServs());
+		user->WriteServ("254 %s :I have %d clients and %d servers",user->nick,ServerInstance->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
 		user->WriteServ("265 %s :Current Local Users: %d  Max: %d",user->nick,ServerInstance->LocalUserCount(),max_local);
 		user->WriteServ("266 %s :Current Global Users: %d  Max: %d",user->nick,n_users,max_global);
 		return;