Merge pull request #223 from Shawn-Smith/insp20+needmoreparams

[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 c6b8e8400672a7503f60ee1eedb392130dbed46a..e9e36b3d1576583e2dc4c3972817a297f0f82755 100644 (file)
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -1,25 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-#ifndef __CMD_LUSERS_H__
-#define __CMD_LUSERS_H__
-
-// include the common header files
 
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
 /** Handle /LUSERS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -44,9 +43,6 @@ class CommandLusers : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 /** Handle /LUSERS
  */
 CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
@@ -55,7 +51,7 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
        unsigned int n_invis = ServerInstance->Users->ModeCount('i');
        ProtoServerList serverlist;
        ServerInstance->PI->GetServerList(serverlist);
-       int n_serv = 1;
+       int n_serv = 0;
        int n_local_servs = 0;
        for(ProtoServerList::iterator i = serverlist.begin(); i != serverlist.end(); ++i)
        {
@@ -63,6 +59,9 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
                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)
@@ -71,7 +70,7 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
                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_users-n_invis, n_serv);
+                       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());
@@ -79,9 +78,7 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
        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());
-
+       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);