X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_stats.cpp;h=de9237c612e30a685a8f8c6e4a7cb3b56e8977e3;hb=5db1d322be106c8462dc691072f9415dc0766ed4;hp=767966caa7c4298b2e7a29cfad3dafcfb6183432;hpb=6c025fcb9e00e80c8279daa70ab4fde3c026e335;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 767966caa..de9237c61 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -46,8 +46,7 @@ CmdResult CommandStats::Handle (const char** parameters, int /* pcnt */, User *u
 
 DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, string_list &results)
 {
-	std::string sn = ServerInstance->Config->ServerName;
-	int statsnumber = 0;
+	std::string sn(ServerInstance->Config->ServerName);
 
 	if ((!*ServerInstance->Config->UserStats && !IS_OPER(user)) || (!IS_OPER(user) && !ServerInstance->ULine(user->server) && !strchr(ServerInstance->Config->UserStats,statschar)))
 	{
@@ -127,7 +126,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 		case 'P':
 		{
 			int idx = 0;
-		  	for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+		  	for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
 			{
 				if (IS_OPER(i->second) && !ServerInstance->ULine(i->second->server))
 				{
@@ -141,21 +140,19 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 		break;
  
 		case 'k':
-			statsnumber = 216;
+			ServerInstance->XLines->InvokeStats("K",216,user,results);
+		break;
 		case 'g':
-			statsnumber = 223;
+			ServerInstance->XLines->InvokeStats("G",223,user,results);
+		break;
 		case 'q':
-			statsnumber = 217;
+			ServerInstance->XLines->InvokeStats("Q",217,user,results);
+		break;
 		case 'Z':
-			statsnumber = 223;
+			ServerInstance->XLines->InvokeStats("Z",223,user,results);
+		break;
 		case 'e':
-		{
-			if (!statsnumber)
-				statsnumber = 223;
-			std::string stat;
-			stat += toupper(statschar);
-			ServerInstance->XLines->InvokeStats(stat,statsnumber,user,results);
-		}
+			ServerInstance->XLines->InvokeStats("E",223,user,results);
 		break;
 
 		/* stats m (list number of times each command has been used, plus bytecount) */
@@ -174,7 +171,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 		case 'z':
 		{
 			results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
-			results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(User))+" bytes)");
+			results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->Users->clientlist->size())+" ("+ConvToStr(ServerInstance->Users->clientlist->size()*sizeof(User))+" bytes)");
 			results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(Channel))+" bytes)");
 			results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(Command))+" bytes)");
 
@@ -197,8 +194,6 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 			}
 
 			results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
-			results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->Modules->modules.size())+" ("+ConvToStr(ServerInstance->Modules->modules.size()*sizeof(Module))+" bytes)");
-			results.push_back(sn+" 249 "+user->nick+" :ModuleHandles(VECTOR) "+ConvToStr(ServerInstance->Modules->handles.size())+" ("+ConvToStr(ServerInstance->Modules->handles.size()*sizeof(ircd_module))+" bytes)");
 
 #ifndef WIN32
 			/* Moved this down here so all the not-windows stuff (look w00tie, I didn't say win32!) is in one ifndef.
@@ -260,7 +255,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 		/* stats l (show user I/O stats) */
 		case 'l':
 			results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-		  	for (std::vector<User*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+		  	for (std::vector<User*>::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
 			{
 				User* i = *n;
 				if (ServerInstance->IsNick(i->nick))
@@ -273,7 +268,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 	/* stats L (show user I/O stats with IP addresses) */
 		case 'L':
 			results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-			for (std::vector<User*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+			for (std::vector<User*>::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++)
 			{
 				User* i = *n;
 				if (ServerInstance->IsNick(i->nick))