Merge pull request #69 from Robby-/insp12-updatesnminorfixes

[1.2] Some minor updates, corrections and fixes...

4 files changed, 15 insertions, 10 deletions

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_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_shun.cpp b/src/modules/m_shun.cpp
index b66639946..79c4950a6 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -110,8 +110,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;
@@ -201,9 +200,15 @@ 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 != 'S')
+		if (symbol != 'H')
 			return 0;
 
 		ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
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
  */