X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=ca948d95b3c195e955ffa24bfd84d7a5aad7bc74;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=461b7bece4d7e7f4d3f113221b6e82bd168672d1;hpb=fe23c1d1817b207e7ce311e11ecab18471ed20b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 461b7bece..ca948d95b 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,103 +1,88 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-Server *Srv;
-	 
+class OperChans : public SimpleChannelModeHandler
+{
+ public:
+	/* This is an oper-only mode */
+	OperChans(Module* Creator) : SimpleChannelModeHandler(Creator, "operonly", 'O')
+	{
+		oper = true;
+	}
+};
 
 class ModuleOperChans : public Module
 {
+	OperChans oc;
  public:
-	ModuleOperChans()
+	ModuleOperChans() : oc(this)
 	{
-		Srv = new Server;
+	}
 
-		// Add a mode +O for channels with no parameters		
-		Srv->AddExtendedMode('Z',MT_CHANNEL,false,0,0);
+	void init()
+	{
+		ServerInstance->Modules->AddService(oc);
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+
+	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
-		if ((modechar == 'O') && (type == MT_CHANNEL))
+		if (chan && chan->IsModeSet('O') && !IS_OPER(user))
 		{
-			chanrec* chan = (chanrec*)target;
-			
-			if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")) || (strchr(source->modes,'o')))
-			{
-				return 1;
-			}
-			else
-			{
-				// 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 -1;
-			}
-	
-			// must return 1 to handle the mode!
-			return 1;
+			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 MOD_RES_DENY;
 		}
-		
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		if (!strchr(user->modes,'o'))
+		if ((mask.length() > 2) && (mask[0] == 'O') && (mask[1] == ':'))
 		{
-			if (chan)
-			{
-				if (chan->IsCustomModeSet('O'))
-				{
-					WriteServ(user->fd,"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) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+				return MOD_RES_DENY;
 		}
-		return 0;
-	}
-	
-    	virtual ~ModuleOperChans()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
+		return MOD_RES_PASSTHRU;
 	}
 
-};
-
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
+	void On005Numeric(std::string &output)
 	{
+		ServerInstance->AddExtBanChar('O');
 	}
-	
-	~ModuleOperChansFactory()
+
+	~ModuleOperChans()
 	{
 	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion()
 	{
-		return new ModuleOperChans;
+		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)