X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=8723f6ca04d15e5723f5b220f8aa7946c98bf3b3;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=76ead18c30aa9fedd86ebad2da8d5b4cb3ee5f5d;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 76ead18c3..8723f6ca0 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,7 +21,7 @@ class OperChans : public ModeHandler
 	/* This is an oper-only mode */
 	OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
@@ -46,50 +46,45 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-	
-	OperChans* oc;
+
+	OperChans oc;
  public:
 	ModuleOperChans(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), oc(Me)
 	{
-				
-		oc = new OperChans(ServerInstance);
-		if (!ServerInstance->AddMode(oc))
+		if (!ServerInstance->Modes->AddMode(&oc))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		List[I_OnUserPreJoin] = 1;
+		if (chan && chan->IsModeSet('O') && !IS_OPER(user))
+		{
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
+				user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+			return 1;
+		}
+		return 0;
 	}
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+	virtual int OnCheckBan(User* user, Channel* chan)
 	{
-		if (!IS_OPER(user))
-		{
-			if (chan)
-			{
-				if (chan->IsModeSet('O'))
-				{
-					user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
-					return 1;
-				}
-			}
-		}
+		if (IS_OPER(user))
+			return chan->GetExtBanStatus(user->oper, 'O');
+
 		return 0;
 	}
-	
+
 	virtual ~ModuleOperChans()
 	{
-		ServerInstance->Modes->DelMode(oc);
-		DELETE(oc);
+		ServerInstance->Modes->DelMode(&oc);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 };