Fix for parameters which contain a colon (which is not the first char in the string)

[user/henk/code/inspircd.git] / src / cmd_stats.cpp

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index e8d92e1066ef2cde2e2ab3f1c3ee2635611c38ce..9335ea09bdec156d73c6680918375c1b1ddf70a7 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -14,46 +14,23 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include "hash_map.h"
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/resource.h>
-#ifndef RUSAGE_SELF
-#define   RUSAGE_SELF     0
-#define   RUSAGE_CHILDREN     -1
-#endif
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "command_parse.h"
 #include "commands/cmd_stats.h"
 
-extern InspIRCd* ServerInstance;
-
-extern time_t TIME;
-
 void cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
 {
        string_list values;
-       DoStats(*parameters[0], user, values);
+       DoStats(this->ServerInstance, *parameters[0], user, values);
        for (size_t i = 0; i < values.size(); i++)
                user->Write(":%s", values[i].c_str());
 }
 
-void DoStats(char statschar, userrec* user, string_list &results)
+void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_list &results)
 {
        std::string sn = ServerInstance->Config->ServerName;
 
@@ -110,7 +87,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
                {
                        if (*i->second->oper)
                        {
-                               results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+ConvToStr(TIME - i->second->idle_lastmsg));
+                               results.push_back(sn+" 249 "+user->nick+" :"+i->second->nick+" ("+i->second->ident+"@"+i->second->dhost+") Idle: "+ConvToStr(ServerInstance->Time() - i->second->idle_lastmsg));
                                idx++;
                        }
                }
@@ -119,27 +96,27 @@ void DoStats(char statschar, userrec* user, string_list &results)
  
        if (statschar == 'k')
        {
-               stats_k(user,results);
+               ServerInstance->XLines->stats_k(user,results);
        }
 
        if (statschar == 'g')
        {
-               stats_g(user,results);
+               ServerInstance->XLines->stats_g(user,results);
        }
 
        if (statschar == 'q')
        {
-               stats_q(user,results);
+               ServerInstance->XLines->stats_q(user,results);
        }
 
        if (statschar == 'Z')
        {
-               stats_z(user,results);
+               ServerInstance->XLines->stats_z(user,results);
        }
 
        if (statschar == 'e')
        {
-               stats_e(user,results);
+               ServerInstance->XLines->stats_e(user,results);
        }
 
        /* stats m (list number of times each command has been used, plus bytecount) */
@@ -167,7 +144,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
                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.size())+" ("+ConvToStr(ServerInstance->modules.size()*sizeof(Module))+")");
                results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+")");
-               if (!getrusage(RUSAGE_SELF,&R))
+               if (!getrusage(0,&R))   /* RUSAGE_SELF */
                {
                        results.push_back(sn+" 249 "+user->nick+" :Total allocation: "+ConvToStr(R.ru_maxrss)+"K");
                        results.push_back(sn+" 249 "+user->nick+" :Signals:          "+ConvToStr(R.ru_nsignals));
@@ -213,7 +190,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
                        userrec* i = *n;
                        if (ServerInstance->IsNick(i->nick))
                        {
-                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(TIME - i->age));
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
                        }
                }
        }
@@ -227,7 +204,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
                        userrec* i = *n;
                        if (ServerInstance->IsNick(i->nick))
                        {
-                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(TIME - i->age));
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
                        }
                }
        }
@@ -236,7 +213,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
        if (statschar == 'u')
        {
                time_t current_time = 0;
-               current_time = TIME;
+               current_time = ServerInstance->Time();
                time_t server_uptime = current_time - ServerInstance->startup_time;
                struct tm* stime;
                stime = gmtime(&server_uptime);
@@ -257,7 +234,7 @@ void DoStats(char statschar, userrec* user, string_list &results)
        }
 
        results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
-       ServerInstance->WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
+       ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
 
        return;
 }