Fix for bug found by danieldg, where remote nicks were truncated to NICKMAX, but...

[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 04f2906acbf020c0c4c6b6cbe0898a3f1b7c0a71..441a3b282b83f234678393130aa25f469ef6903f 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-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,19 +21,19 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LUSERS
  */
-CmdResult CommandLusers::Handle (const char** parameters, int pcnt, User *user)
+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->WriteServ("251 %s :There are %d users and %d invisible on 1 server",user->nick,ServerInstance->UserCount()-ServerInstance->InvisibleUserCount(),ServerInstance->InvisibleUserCount());
-       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());
+       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'));
+       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->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount());
-       if (ServerInstance->LocalUserCount())
-               user->WriteServ("255 %s :I have %d clients and 0 servers",user->nick,ServerInstance->LocalUserCount());
+               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());
 
        return CMD_SUCCESS;
 }