X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channelban.cpp;h=c34e0a6c5469df27becb2736c061bda96c7717c3;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=4d3f80e361d035cc155da3f7c9c7b8d47869ad37;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 4d3f80e36..c34e0a6c5 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -25,26 +25,26 @@ class ModuleBadChannelExtban : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides extban 'j', ban users that are present in another channel, and optionally on their status there", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
 	{
 		if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':'))
 		{
-			std::string rm = mask.substr(2);
+			std::string rm(mask, 2);
 			char status = 0;
-			ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+			const PrefixMode* const mh = ServerInstance->Modes->FindPrefix(rm[0]);
 			if (mh)
 			{
-				rm = mask.substr(3);
+				rm.assign(mask, 3, std::string::npos);
 				status = mh->GetModeChar();
 			}
 			for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 			{
 				if (InspIRCd::Match((*i)->chan->name, rm))
 				{
-					if (!status || (*i)->hasMode(status))
+					if ((!status) || ((*i)->HasMode(mh)))
 						return MOD_RES_DENY;
 				}
 			}