X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=61e423aefee33de298b5eaafab8418eaceebebfb;hb=a23a840749db9646884907ae28588b1962dc2449;hp=4600760f2c35cf62e8d1d144208bece8ea874836;hpb=31f1e7ad092f8bf16ee653cc105eea4a769650ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 4600760f2..61e423aef 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -46,13 +46,13 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-	
+
 	OperChans* oc;
  public:
 	ModuleOperChans(InspIRCd* Me)
 		: Module(Me)
 	{
-				
+
 		oc = new OperChans(ServerInstance);
 		if (!ServerInstance->Modes->AddMode(oc))
 			throw ModuleException("Could not add new modes!");
@@ -69,23 +69,32 @@ class ModuleOperChans : public Module
 			{
 				if (chan->IsModeSet('O'))
 				{
-					user->WriteNumeric(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+					user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
 					return 1;
 				}
 			}
 		}
+		else
+		{
+			if (chan && chan->IsExtBanned(user->oper, 'O'))
+			{
+				user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+				return 1;
+			}
+		}
+
 		return 0;
 	}
-	
+
 	virtual ~ModuleOperChans()
 	{
 		ServerInstance->Modes->DelMode(oc);
 		delete oc;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 };