Move ugly .*.inc files into make/template/ where they can be more easily found

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

diff --git a/src/stats.cpp b/src/stats.cpp
index d385112c298dbbd6cecca3416c77398052e739f0..eb8fe0e450403bd0bf37b60af70c2585782e4ffe 100644 (file)
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -19,7 +19,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 {
        std::string sn(this->Config->ServerName);
 
-       if (!user->HasPrivPermission("servers/auspex") && !strchr(this->Config->UserStats, statschar))
+       if (!user->HasPrivPermission("servers/auspex") && Config->UserStats.find(statschar) == std::string::npos)
        {
                this->SNO->WriteToSnoMask('t',
                                "%s '%c' denied for %s (%s@%s)",
@@ -30,7 +30,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
        }
 
        ModResult MOD_RESULT;
-       FIRST_MOD_RESULT(this, OnStats, MOD_RESULT, (statschar, user, results));
+       FIRST_MOD_RESULT(OnStats, MOD_RESULT, (statschar, user, results));
        if (MOD_RESULT == MOD_RES_DENY)
        {
                results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
@@ -50,8 +50,8 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                                if (ip.empty())
                                        ip.assign("*");
 
-                               results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(this->ports[i]->GetPort())+" (client, " +
-                                               this->ports[i]->GetDescription() + ")");
+                               results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ports[i]->bind_port)+
+                                       " (" + ports[i]->type + ", " + ports[i]->hook + ")");
                        }
                }
                break;
@@ -79,7 +79,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                        for (ClassVector::iterator i = this->Config->Classes.begin(); i != this->Config->Classes.end(); i++)
                        {
                                ConnectClass* c = *i;
-                               results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(c->GetPingTime())+" 0 "+ConvToStr(c->GetSendqMax())+" :"+
+                               results.push_back(sn+" 218 "+user->nick+" Y "+ConvToStr(idx)+" "+ConvToStr(c->GetPingTime())+" 0 "+ConvToStr(c->GetSendqHardMax())+" :"+
                                                ConvToStr(c->GetRecvqMax())+" "+ConvToStr(c->GetRegTimeout()));
                                idx++;
                        }
@@ -88,11 +88,9 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 
                case 'U':
                {
-                       char ulined[MAXBUF];
-                       for (int i = 0; i < this->Config->ConfValueEnum("uline"); i++)
+                       for(std::map<irc::string, bool>::iterator i = Config->ulines.begin(); i != Config->ulines.end(); ++i)
                        {
-                               this->Config->ConfValue("uline","server", i, ulined, MAXBUF);
-                                       results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined));
+                               results.push_back(sn+" 248 "+user->nick+" U "+std::string(i->first.c_str()));
                        }
                }
                break;
@@ -157,19 +155,13 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 
                        if (!this->Config->WhoWasGroupSize == 0 && !this->Config->WhoWasMaxGroups == 0)
                        {
-                               Command* whowas_command = this->Parser->GetHandler("WHOWAS");
-                               if (whowas_command)
+                               Module* whowas = Modules->Find("cmd_whowas.so");
+                               if (whowas)
                                {
-                                       std::deque<classbase*> params;
-                                       Extensible whowas_stats;
-                                       params.push_back(&whowas_stats);
-                                       whowas_command->HandleInternal(WHOWAS_STATS, params);
-                                       if (whowas_stats.GetExt("stats"))
-                                       {
-                                               char* statc;
-                                               whowas_stats.GetExt("stats", statc);
-                                               results.push_back(sn+" 249 "+user->nick+" :"+ConvToStr(statc));
-                                       }
+                                       WhowasRequest req(NULL, whowas, WhowasRequest::WHOWAS_STATS);
+                                       req.user = user;
+                                       req.Send();
+                                       results.push_back(sn+" 249 "+user->nick+" :"+req.value);
                                }
                        }
 
@@ -242,15 +234,13 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 
                /* stats o */
                case 'o':
-                       for (int i = 0; i < this->Config->ConfValueEnum("oper"); i++)
+                       for (int i = 0;; i++)
                        {
-                               char LoginName[MAXBUF];
-                               char HostName[MAXBUF];
-                               char OperType[MAXBUF];
-                               this->Config->ConfValue("oper","name", i, LoginName, MAXBUF);
-                               this->Config->ConfValue("oper","host", i, HostName, MAXBUF);
-                               this->Config->ConfValue("oper","type", i, OperType, MAXBUF);
-                               results.push_back(sn+" 243 "+user->nick+" O "+HostName+" * "+LoginName+" "+OperType+" 0");
+                               ConfigTag* tag = Config->ConfValue("oper", i);
+                               if (!tag)
+                                       break;
+                               results.push_back(sn+" 243 "+user->nick+" O "+tag->getString("host")+" * "+
+                                       tag->getString("name") + " " + tag->getString("type")+" 0");
                        }
                break;
 
@@ -260,7 +250,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                        for (std::vector<User*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)
                        {
                                User* i = *n;
-                               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(this->Time() - i->age));
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(this->Time() - i->age));
                        }
                break;
 
@@ -270,7 +260,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                        for (std::vector<User*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)
                        {
                                User* i = *n;
-                               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(this->Time() - i->age));
+                               results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->getSendQSize())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(this->Time() - i->age));
                        }
                break;