X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channelban.cpp;h=b19ab049432771d0edafdbaaa6d9dcc4ea5280aa;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=eeb5c751dbbaf3f0f32721a72839da912ab58fee;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index eeb5c751d..b19ab0494 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -19,33 +19,51 @@ class ModuleBadChannelExtban : public Module
 {
  private:
  public:
-	ModuleBadChannelExtban(InspIRCd* Me) : Module(Me)
-	{
+	ModuleBadChannelExtban() 	{
 		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleBadChannelExtban()
+	~ModuleBadChannelExtban()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Extban 'j' - channel status/join ban", VF_COMMON|VF_VENDOR);
 	}
 
-	virtual int OnCheckBan(User *user, Channel *c)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		int rv = 0;
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		if (mask[0] == 'j' && mask[1] == ':')
 		{
-			rv = banmatch_reduce(rv, c->GetExtBanStatus(i->first->name, 'j'));
+			std::string rm = mask.substr(2);
+			char status = 0;
+			ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+			if (mh)
+			{
+				rm = mask.substr(3);
+				status = mh->GetModeChar();
+			}
+			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+			{
+				if (InspIRCd::Match((**i).name, rm))
+				{
+					if (status)
+					{
+						Membership* memb = c->GetUser(user);
+						if (memb->hasMode(status))
+							return MOD_RES_DENY;
+					}
+					else
+						return MOD_RES_DENY;
+				}
+			}
 		}
-
-		return rv;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		ServerInstance->AddExtBanChar('j');
 	}