From f5c985ba84ab705f4b7b3921a271b4d64848deec Mon Sep 17 00:00:00 2001 From: Robby- Date: Tue, 17 Apr 2012 18:38:05 +0200 Subject: Replace [cC]olour with [cC]olor --- src/modules/m_blockcolor.cpp | 10 +++++----- src/modules/m_stripcolor.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 6ed27d810..bfe3ad308 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -23,13 +23,13 @@ class BlockColor : public SimpleChannelModeHandler BlockColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'c') { } }; -class ModuleBlockColour : public Module +class ModuleBlockColor : public Module { bool AllowChanOps; BlockColor *bc; public: - ModuleBlockColour(InspIRCd* Me) : Module(Me) + ModuleBlockColor(InspIRCd* Me) : Module(Me) { bc = new BlockColor(ServerInstance); if (!ServerInstance->Modes->AddMode(bc)) @@ -66,7 +66,7 @@ class ModuleBlockColour : public Module case 21: case 22: case 31: - user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name.c_str()); + user->WriteNumeric(404, "%s %s :Can't send colors to channel (+c set)",user->nick.c_str(), c->name.c_str()); return 1; break; } @@ -81,7 +81,7 @@ class ModuleBlockColour : public Module return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); } - virtual ~ModuleBlockColour() + virtual ~ModuleBlockColor() { ServerInstance->Modes->DelMode(bc); delete bc; @@ -93,4 +93,4 @@ class ModuleBlockColour : public Module } }; -MODULE_INIT(ModuleBlockColour) +MODULE_INIT(ModuleBlockColor) diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 19f658ee0..db060a44e 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -13,7 +13,7 @@ #include "inspircd.h" -/* $ModDesc: Provides channel +S mode (strip ansi colour) */ +/* $ModDesc: Provides channel +S mode (strip ansi color) */ /** Handles channel mode +S */ -- cgit v1.3.1-10-gc9f91 From eb9b000d72432e0a6fc8794b16d1636446839848 Mon Sep 17 00:00:00 2001 From: Robby- Date: Tue, 17 Apr 2012 18:52:19 +0200 Subject: /STATS: Update the helpop stats-characters aswell as give the ziplink and shun modules their own stats-characters so they actually work and don't collide with others (shun was for example overriding svsholds output) --- conf/inspircd.helpop-full.example | 16 +++++++++++----- src/commands/cmd_stats.cpp | 4 ++-- src/modules/extra/m_ziplink.cpp | 2 +- src/modules/m_shun.cpp | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/modules') diff --git a/conf/inspircd.helpop-full.example b/conf/inspircd.helpop-full.example index 9ac1cab53..b85aa2a08 100644 --- a/conf/inspircd.helpop-full.example +++ b/conf/inspircd.helpop-full.example @@ -905,24 +905,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 +I Show ziplink statistics (requires ziplink module) +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 +E Show socket engine events +S Show currently held registered nicknames Note that all /STATS use is broadcast to online IRC operators."> diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp index f09fcf84f..b7550a747 100644 --- a/src/commands/cmd_stats.cpp +++ b/src/commands/cmd_stats.cpp @@ -79,7 +79,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str 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 < ServerInstance->ports.size(); i++) @@ -302,7 +302,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, str } 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::iterator n = ServerInstance->Users->local_users.begin(); n != ServerInstance->Users->local_users.end(); n++) diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp index b42d18f8c..12057bb35 100644 --- a/src/modules/extra/m_ziplink.cpp +++ b/src/modules/extra/m_ziplink.cpp @@ -136,7 +136,7 @@ class ModuleZLib : public Module /* Handle stats z (misc stats) */ virtual int OnStats(char symbol, User* user, string_list &results) { - if (symbol == 'z') + if (symbol == 'I') { std::string sn = ServerInstance->Config->ServerName; diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index b66639946..8f119269e 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -203,7 +203,7 @@ class ModuleShun : public Module virtual int OnStats(char symbol, User* user, string_list& out) { - if (symbol != 'S') + if (symbol != 'H') return 0; ServerInstance->XLines->InvokeStats("SHUN", 223, user, out); -- cgit v1.3.1-10-gc9f91 From 33f78b511e37ce48481b964535776126d29ab0d4 Mon Sep 17 00:00:00 2001 From: Robby- Date: Tue, 17 Apr 2012 23:30:31 +0200 Subject: shun: Correct stats character in the notice too --- src/modules/m_shun.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 8f119269e..04c986321 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -111,7 +111,7 @@ class CommandShun : public Command else { // XXX todo implement stats - user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats S.",user->nick.c_str(),target.c_str()); + user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats H.",user->nick.c_str(),target.c_str()); } return CMD_SUCCESS; -- cgit v1.3.1-10-gc9f91 From 4d4ed3ae74ffe63f8f26024b3a8c45119330acd4 Mon Sep 17 00:00:00 2001 From: Robby- Date: Tue, 17 Apr 2012 23:35:16 +0200 Subject: shun: stats functionality is implemented, this may be removed --- src/modules/m_shun.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 04c986321..648c3878d 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -110,7 +110,6 @@ class CommandShun : public Command } else { - // XXX todo implement stats user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats H.",user->nick.c_str(),target.c_str()); } -- cgit v1.3.1-10-gc9f91 From 61b2671933ff9885d394d1e9f986407ccc4debd1 Mon Sep 17 00:00:00 2001 From: Robby- Date: Wed, 18 Apr 2012 00:16:40 +0200 Subject: Make m_shun work on aliases --- src/modules/m_shun.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/modules') diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 648c3878d..79c4950a6 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -200,6 +200,12 @@ class ModuleShun : public Module delete f; } + void Prioritize() + { + Module* alias = ServerInstance->Modules->Find("m_alias.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &alias); + } + virtual int OnStats(char symbol, User* user, string_list& out) { if (symbol != 'H') -- cgit v1.3.1-10-gc9f91