X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=3e2b271816cdddc4b35377fa5494aadd81ed0612;hb=5c9427cde0a949a17a476311db0a2a275345337b;hp=68ce664be848fbc0e071580a209ece5cc5547565;hpb=2c1dd9be2be86546e6dc1231b5df80af1ec1b23a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 68ce664be..3e2b27181 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -1,118 +1,87 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * ---------------------------------------------------
+ * 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 hiding oper status with user mode +I */
+/* $ModDesc: Provides support for hiding channels with user mode +I */
 
 /** Handles user mode +I
  */
-class HideChans : public ModeHandler
+class HideChans : public SimpleUserModeHandler
 {
  public:
-	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, true) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
-		if (adding)
-		{
-			if (!dest->IsModeSet('I'))
-			{
-				dest->SetMode('I',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('I'))
-			{
-				dest->SetMode('I',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-		
-		return MODEACTION_DENY;
-	}
+	HideChans(Module* Creator) : SimpleUserModeHandler(Creator, "hidechans", 'I') { }
 };
 
 class ModuleHideChans : public Module
 {
-	
-	HideChans* hm;
+	bool AffectsOpers;
+	HideChans hm;
  public:
-	ModuleHideChans(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleHideChans() : hm(this)
 	{
-		
-		hm = new HideChans(ServerInstance);
-		ServerInstance->AddMode(hm, 'I');
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnWhoisLine] = 1;
-	}
-	
-	virtual ~ModuleHideChans()
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(hm);
-		DELETE(hm);
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		ServerInstance->Modules->AddService(hm);
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		OnRehash(NULL);
 	}
 
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		/* Dont display channels if they have +I set and the
-		 * person doing the WHOIS is not an oper
-		 */
-		return ((!*user->oper) && (numeric == 319) && dest->IsModeSet('I'));
+		return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
 	}
-};
 
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-	ModuleHideChansFactory()
-	{
-	}
-	
-	~ModuleHideChansFactory()
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
+		AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
 	{
-		return new ModuleHideChans(Me);
+		/* always show to self */
+		if (user == dest)
+			return MOD_RES_PASSTHRU;
+
+		/* don't touch anything except 319 */
+		if (numeric != 319)
+			return MOD_RES_PASSTHRU;
+
+		/* don't touch if -I */
+		if (!dest->IsModeSet('I'))
+			return MOD_RES_PASSTHRU;
+
+		/* if it affects opers, we don't care if they are opered */
+		if (AffectsOpers)
+			return MOD_RES_DENY;
+
+		/* doesn't affect opers, sender is opered */
+		if (user->HasPrivPermission("users/auspex"))
+			return MOD_RES_PASSTHRU;
+
+		/* user must be opered, boned. */
+		return MOD_RES_DENY;
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans)