Exclude LUSERS lines with zero counts (NO WE WONT CHANGE THE SPELLING OF connection(s)!)

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

2 files changed, 14 insertions, 7 deletions

diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp
index 3b1decea3..fb28adc46 100644
--- a/src/cmd_lusers.cpp
+++ b/src/cmd_lusers.cpp
@@ -24,8 +24,12 @@ void cmd_lusers::Handle (const char** parameters, int pcnt, userrec *user)
 	// this lusers command shows one server at all times because
 	// a protocol module must override it to show those stats.
 	WriteServ(user->fd,"251 %s :There are %d users and %d invisible on 1 server",user->nick,usercnt()-usercount_invisible(),usercount_invisible());
-	WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
-	WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
-	WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
-	WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,local_count());
+	if (usercount_opers())
+		WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
+	if (usercount_unknown())
+		WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
+	if (chancount())
+		WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
+	if (local_count())
+		WriteServ(user->fd,"254 %s :I have %d clients and 0 servers",user->nick,local_count());
 }
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 44ee04bfd..5d04c1343 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -2996,9 +2996,12 @@ class ModuleSpanningTree : public Module
 			max_global = n_users;
 
 		WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-usercount_invisible(),usercount_invisible(),this->CountServs());
-		WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
-		WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
-		WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
+		if (usercount_opers())
+			WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
+		if (usercount_unknown())
+			WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
+		if (chancount())
+			WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
 		WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),this->CountLocalServs());
 		WriteServ(user->fd,"265 %s :Current Local Users: %d  Max: %d",user->nick,local_count(),max_local);
 		WriteServ(user->fd,"266 %s :Current Global Users: %d  Max: %d",user->nick,n_users,max_global);