X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_operchans.cpp;h=7f3b989aa32f8216b708c13194cb6c00eb11d889;hb=1afe959c7574b479e4a49a62885d2ac2757025ab;hp=fb181d1f54930234dfcf0ff7a3667e729de85186;hpb=feaf72ecb48470114fbe3f3058b5f4b9622b88a5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index fb181d1f5..7f3b989aa 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -16,72 +16,69 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-Server *Srv;
-	 
-
-class ModuleOperChans : public Module
+class OperChans : public ModeHandler
 {
  public:
-	ModuleOperChans(Server* Me)
-		: Module::Module(Me)
-	{
-		Srv = Me;
-		// Add a mode +O for channels with no parameters		
-		Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
-	}
+	/* This is an oper-only mode */
+	OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-	void Implements(char* List)
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
-	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		if ((modechar == 'O') && (type == MT_CHANNEL))
+		if (adding)
 		{
-			chanrec* chan = (chanrec*)target;
-			
-			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (*user->oper))
+			if (!channel->IsModeSet('O'))
 			{
-				log(DEBUG,"Allowing mode +O");
-				return 1;
+				channel->SetMode('O',true);
+				return MODEACTION_ALLOW;
 			}
-			else
+		}
+		else
+		{
+			if (channel->IsModeSet('O'))
 			{
-				// eat the mode change, return an error
-				WriteServ(user->fd,"468 %s %s :Only servers and opers may set channel mode +O",user->nick, chan->name);
-				return 0;
+				channel->SetMode('O',false);
+				return MODEACTION_ALLOW;
 			}
-	
-			// must return 1 to handle the mode!
-			return 1;
 		}
-		
-		return 0;
+
+		return MODEACTION_DENY;
 	}
+};
 
-        virtual void On005Numeric(std::string &output)
-        {
-		InsertMode(output,"O",4);
-        }
+class ModuleOperChans : public Module
+{
 	
+	OperChans* oc;
+ public:
+	ModuleOperChans(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+				
+		oc = new OperChans(ServerInstance);
+		ServerInstance->AddMode(oc, 'O');
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnUserPreJoin] = 1;
+	}
+
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
 		if (!*user->oper)
 		{
 			if (chan)
 			{
-				if (chan->IsCustomModeSet('O'))
+				if (chan->IsModeSet('O'))
 				{
-					WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+					user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
 					return 1;
 				}
 			}
@@ -91,6 +88,7 @@ class ModuleOperChans : public Module
 	
     	virtual ~ModuleOperChans()
 	{
+		DELETE(oc);
 	}
 	
 	virtual Version GetVersion()
@@ -111,7 +109,7 @@ class ModuleOperChansFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleOperChans(Me);
 	}