Change m_gecosban to extban g and m_account_modes to extban r

inspircd · Jun 5, 2011 · 4238f3b · 4238f3b
1 parent cbbd56b
commit 4238f3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/modules/m_account_modes.cpp b/src/modules/m_account_modes.cpp
@@ -60,7 +60,7 @@ class ModuleAccountModes : public Module
 
 	void On005Numeric(std::string &t)
 	{
-		ServerInstance->AddExtBanChar('R');
+		ServerInstance->AddExtBanChar('r');
 	}
 
 	ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -94,9 +94,10 @@ class ModuleAccountModes : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+	// XXX: Does this belong in m_services_account?
 	ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
 	{
-		if (mask[0] == 'R' && mask[1] == ':')
+		if (mask[0] == 'r' && mask[1] == ':')
 		{
 			std::string acctname = account ? account->GetAccountName(user) : "";
 			if (acctname == mask.substr(2))

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
@@ -13,7 +13,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements extban +b r: - realname (gecos) bans */
+/* $ModDesc: Implements extban +b g: - gecos bans */
 
 class ModuleGecosBan : public Module
 {
@@ -30,12 +30,12 @@ class ModuleGecosBan : public Module
 
 	Version GetVersion()
 	{
-		return Version("Extban 'r' - realname (gecos) ban", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Implements extban +b g: - gecos bans", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		if (mask[0] == 'r' && mask[1] == ':')
+		if (mask[0] == 'g' && mask[1] == ':')
 		{
 			if (InspIRCd::Match(user->fullname, mask.substr(2)))
 				return MOD_RES_DENY;
@@ -45,7 +45,7 @@ class ModuleGecosBan : public Module
 
 	void On005Numeric(std::string &output)
 	{
-		ServerInstance->AddExtBanChar('r');
+		ServerInstance->AddExtBanChar('g');
 	}
 };