Merge pull request #70 from Shawn-Smith/insp20+chancreatefix

[user/henk/code/inspircd.git] / src / commands / cmd_lusers.cpp

diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp
index ea278a406ab94fed699ebd04e3a57f00a32e0c3d..ca970bbb606d3102a3af02d6ad868340e7e96320 100644 (file)
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -13,8 +13,8 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_LUSERS_H__
-#define __CMD_LUSERS_H__
+#ifndef CMD_LUSERS_H
+#define CMD_LUSERS_H
 
 // include the common header files
 
@@ -28,10 +28,13 @@
  */
 class CommandLusers : public Command
 {
+       unsigned int max_local, max_global;
  public:
        /** Constructor for lusers.
         */
-       CommandLusers (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"LUSERS",0,0) { }
+       CommandLusers ( Module* parent) : Command(parent,"LUSERS",0,0),
+               max_local(0), max_global(0)
+       { }
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -48,17 +51,41 @@ class CommandLusers : public Command
  */
 CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
 {
-       // this lusers command shows one server at all times because
-       // a protocol module must override it to show those stats.
-       user->WriteNumeric(251, "%s :There are %d users and %d invisible on 1 server",user->nick.c_str(),ServerInstance->Users->UserCount()-ServerInstance->Users->ModeCount('i'),ServerInstance->Users->ModeCount('i'));
+       unsigned int n_users = ServerInstance->Users->UserCount();
+       unsigned int n_invis = ServerInstance->Users->ModeCount('i');
+       ProtoServerList serverlist;
+       ServerInstance->PI->GetServerList(serverlist);
+       int n_serv = 0;
+       int n_local_servs = 0;
+       for(ProtoServerList::iterator i = serverlist.begin(); i != serverlist.end(); ++i)
+       {
+               n_serv++;
+               if (i->parentname == ServerInstance->Config->ServerName)
+                       n_local_servs++;
+       }
+       // fix for default GetServerList not returning us
+       if (!n_serv)
+               n_serv = 1;
+
+       // these are updated on every connect (or /lusers invocation), which is good enough
+       if (ServerInstance->Users->LocalUserCount() > max_local)
+               max_local = ServerInstance->Users->LocalUserCount();
+       if (n_users > max_global)
+               max_global = n_users;
+
+       user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick.c_str(),
+                       n_users-n_invis, n_invis, n_serv);
+
        if (ServerInstance->Users->OperCount())
                user->WriteNumeric(252, "%s %d :operator(s) online",user->nick.c_str(),ServerInstance->Users->OperCount());
+
        if (ServerInstance->Users->UnregisteredUserCount())
                user->WriteNumeric(253, "%s %d :unknown connections",user->nick.c_str(),ServerInstance->Users->UnregisteredUserCount());
-       if (ServerInstance->ChannelCount())
-               user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount());
-       if (ServerInstance->Users->LocalUserCount())
-               user->WriteNumeric(255, "%s :I have %d clients and 0 servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount());
+
+       user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount());
+       user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),n_local_servs);
+       user->WriteNumeric(265, "%s :Current Local Users: %d  Max: %d",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),max_local);
+       user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d",user->nick.c_str(),n_users,max_global);
 
        return CMD_SUCCESS;
 }