Merge pull request #74 from Robby-/insp20-statsupdates

[2.0] /STATS updates

diff --git a/docs/inspircd.helpop-full.example b/docs/inspircd.helpop-full.example
index 68eb266c9089a86bd4f9c4e7e566056e99858d7a..0169077ba68c196d4fcc4293c63fb7a60c794fb3 100644 (file)
--- a/docs/inspircd.helpop-full.example
+++ b/docs/inspircd.helpop-full.example
@@ -930,24 +930,30 @@ e  Show e-lines (local ban exemptions)
 g  Show g-lines (host bans)
 k  Show k-lines (local host bans)
 q  Show q-lines (nick mask bans)
-Z  Show z-lines (ip mask bans)
+Z  Show z-lines (IP mask bans)
+R  Show R-lines (regular expression bans)
 
+H  Show shuns
 s  Show filters
 C  Show channel bans
 
 c  Show link blocks
-l  Show all inbound and outbound server and client connections
+d  Show configured DNSBLs and related statistics
 m  Show command statistics, number of times commands have been used
 o  Show a list of all valid oper usernames and hostmasks
-p  Show open client ports, and the port type (ssl, plaintext, etc) plus number of users on each port
+p  Show open client ports, and the port type (ssl, plaintext, etc)
 u  Show server uptime
 z  Show memory usage statistics
-I  Show connect class permissions
+i  Show connect class permissions
+l  Show all client connections with information (sendq, commands, bytes, time connected)
 L  Show all client connections with information and IP address
 P  Show online opers and their idle times
 T  Show bandwidth/socket statistics
-U  Show u-lined servers
+U  Show U-lined servers
 Y  Show connection classes
+O  Show opertypes and the allowed user and channel modes it can set
+E  Show socket engine events
+S  Show currently held registered nicknames
 
 Note that all /STATS use is broadcast to online IRC operators.">
 
@@ -987,7 +993,7 @@ Note that all /STATS use is broadcast to online IRC operators.">
  Q      Allows receipt of remote quit messages.
  t      Allows receipt of attempts to use /STATS (local and remote).
  v      Allows receipt of oper-override notices (requires override module).
- x      Allows receipt of Xline notice (g/z/q/k/e).">
+ x      Allows receipt of Xline notices (g/z/q/k/e/R/shuns).">
 
 ######################
 #      EXTBANS       #

diff --git a/docs/inspircd.helpop.example b/docs/inspircd.helpop.example
index 3688f74b3f070d560636a8ee21473b377e041bee..fec81865e7d425b9a3d50fce1c0047626335b657 100644 (file)
--- a/docs/inspircd.helpop.example
+++ b/docs/inspircd.helpop.example
@@ -249,7 +249,7 @@ help channel if you have any questions.">
  Q      Allows receipt of remote quit messages.
  t      Allows receipt of attempts to use /STATS (local and remote).
  v      Allows receipt of oper-override notices (requires override module).
- x      Allows receipt of Xline notice (g/z/q/k/e).">
+ x      Allows receipt of Xline notices (g/z/q/k/e/R/shuns).">
 
 <helpop key="extbans" value="Extended Bans
 ----------

diff --git a/src/stats.cpp b/src/stats.cpp
index 9c177c7803c1977de79fdfa996e21253e70865fe..5a117b5d3f1497c5cd11a0dd3ce26aedb3454fea 100644 (file)
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -41,7 +41,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
 
        switch (statschar)
        {
-               /* stats p (show listening ports and registered clients on each) */
+               /* stats p (show listening ports) */
                case 'p':
                {
                        for (size_t i = 0; i < this->ports.size(); i++)
@@ -301,7 +301,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                        }
                break;
 
-       /* stats L (show user I/O stats with IP addresses) */
+               /* 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<LocalUser*>::iterator n = this->Users->local_users.begin(); n != this->Users->local_users.end(); n++)