X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=f31979cea8dd78049d356a1768febdb299987836;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=d97142e66a5b0f323e2520cad4a4c3cf14e2d4de;hpb=1524caf2f799cff54c2de330c9670a0b761ba3d8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index d97142e66..f31979cea 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,7 +19,7 @@ class OperChans : public ModeHandler
 {
  public:
 	/* This is an oper-only mode */
-	OperChans(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
+	OperChans(Module* Creator) : ModeHandler(Creator, "operonly", 'O', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
@@ -46,19 +46,17 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-
 	OperChans oc;
  public:
-	ModuleOperChans(InspIRCd* Me)
-		: Module(Me), oc(Me, this)
+	ModuleOperChans() : oc(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&oc))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric, I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if (chan && chan->IsModeSet('O') && !IS_OPER(user))
 		{
@@ -69,22 +67,28 @@ class ModuleOperChans : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult OnCheckBan(User* user, Channel* chan)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		if (IS_OPER(user))
-			return chan->GetExtBanStatus(user->oper, 'O');
-
+		if (mask[0] == 'O' && mask[1] == ':')
+		{
+			if (IS_OPER(user) && InspIRCd::Match(user->oper->name, mask.substr(2)))
+				return MOD_RES_DENY;
+		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleOperChans()
+	void On005Numeric(std::string &output)
+	{
+		ServerInstance->AddExtBanChar('O');
+	}
+
+	~ModuleOperChans()
 	{
-		ServerInstance->Modes->DelMode(&oc);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
 	}
 };