Patch to not increment nickchange counter for nick changes that would be blocked...

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

diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 66274c58ac67939bc81b262dd8f296fa4cd5c0fa..f09fcf84fefba52d1e3b4e3b894ecbe9ff598ace 100644 (file)
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -39,7 +39,12 @@ CmdResult CommandStats::Handle (const std::vector<std::string>& parameters, User
        if (IS_LOCAL(user))
        {
                string_list values;
-               char search = parameters[0].length() ? parameters[0][0] : 0;
+               if (parameters[0].empty())
+               {
+                       user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s STATS :Not enough parameters.", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+               char search = parameters[0][0];
                DoStats(this->ServerInstance, search, user, values);
                for (size_t i = 0; i < values.size(); i++)
                        user->Write(":%s", values[i].c_str());
@@ -77,14 +82,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                /* stats p (show listening ports and registered clients on each) */
                case 'p':
                {
-                       for (size_t i = 0; i < ServerInstance->Config->ports.size(); i++)
+                       for (size_t i = 0; i < ServerInstance->ports.size(); i++)
                        {
-                               std::string ip = ServerInstance->Config->ports[i]->GetIP();
+                               std::string ip = ServerInstance->ports[i]->GetIP();
                                if (ip.empty())
                                        ip.assign("*");
 
-                               results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->Config->ports[i]->GetPort())+" (client, " +
-                                               ServerInstance->Config->ports[i]->GetDescription() + ")");
+                               results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->ports[i]->GetPort())+" (client, " +
+                                               ServerInstance->ports[i]->GetDescription() + ")");
                        }
                }
                break;
@@ -100,7 +105,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                        for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {
                                ConnectClass* c = *i;
-                               results.push_back(sn+" 215 "+user->nick+" I NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : ServerInstance->SE->GetMaxFds())+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
+                               results.push_back(sn+" 215 "+user->nick+" i NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : ServerInstance->SE->GetMaxFds())+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");
                                idx++;
                        }
                }
@@ -122,9 +127,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
                case 'U':
                {
                        char ulined[MAXBUF];
-                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "uline"); i++)
+                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum("uline"); i++)
                        {
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "uline","server", i, ulined, MAXBUF);
+                               ServerInstance->Config->ConfValue("uline","server", i, ulined, MAXBUF);
                                        results.push_back(sn+" 248 "+user->nick+" U "+std::string(ulined));
                        }
                }
@@ -275,14 +280,14 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str
 
                /* stats o */
                case 'o':
-                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
+                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum("oper"); i++)
                        {
                                char LoginName[MAXBUF];
                                char HostName[MAXBUF];
                                char OperType[MAXBUF];
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","name", i, LoginName, MAXBUF);
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","host", i, HostName, MAXBUF);
-                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper","type", i, OperType, MAXBUF);
+                               ServerInstance->Config->ConfValue("oper","name", i, LoginName, MAXBUF);
+                               ServerInstance->Config->ConfValue("oper","host", i, HostName, MAXBUF);
+                               ServerInstance->Config->ConfValue("oper","type", i, OperType, MAXBUF);
                                results.push_back(sn+" 243 "+user->nick+" O "+HostName+" * "+LoginName+" "+OperType+" 0");
                        }
                break;