X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_lusers.cpp;h=4a2f4f7df3f001a6e9533de4b3e018cf12cc290e;hb=10d8e9151d75c1ef81740d56b703fc147086f175;hp=04f2906acbf020c0c4c6b6cbe0898a3f1b7c0a71;hpb=5d5285f24b1fe306faa2a6d0565ba1cff0f17f11;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp
index 04f2906ac..4a2f4f7df 100644
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,29 +12,83 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_lusers.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+#ifndef __CMD_LUSERS_H__
+#define __CMD_LUSERS_H__
+
+// include the common header files
+
+#include "users.h"
+#include "channels.h"
+
+/** Handle /LUSERS. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandLusers : public Command
 {
-	return new CommandLusers(Instance);
-}
+	unsigned int max_local, max_global;
+ public:
+	/** Constructor for lusers.
+	 */
+	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
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
+#endif
+
 
 /** 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());
-	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());
+	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());
+
+	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;
 }
 
+
+COMMAND_INIT(CommandLusers)