X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=17e2e86054db6561c21c9a816efbdfc6ac13f92d;hb=9539fa9d7bcb19100bd5b7f67d6f792e48fff909;hp=766e76f8f9a1ef6265037b7a9885fc8765b7e9aa;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 766e76f8f..17e2e8605 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd.h"
 
 /* $ModDesc: Provides support for hiding channels with user mode +I */
@@ -20,9 +27,9 @@
 class HideChans : public ModeHandler
 {
  public:
-	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
+	HideChans(Module* Creator) : ModeHandler(Creator, "hidechans", 'I', PARAM_NONE, MODETYPE_USER) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -47,38 +54,57 @@ class HideChans : public ModeHandler
 
 class ModuleHideChans : public Module
 {
-
-	HideChans* hm;
+	bool AffectsOpers;
+	HideChans hm;
  public:
-	ModuleHideChans(InspIRCd* Me)
-		: Module(Me)
+	ModuleHideChans() : hm(this)
 	{
-
-		hm = new HideChans(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(hm))
+		if (!ServerInstance->Modes->AddMode(&hm))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhoisLine };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+		OnRehash(NULL);
 	}
 
-
 	virtual ~ModuleHideChans()
 	{
-		ServerInstance->Modes->DelMode(hm);
-		delete hm;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
 	}
 
-	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	virtual void OnRehash(User* user)
 	{
-		/* Dont display channels if they have +I set and the
-		 * person doing the WHOIS is not an oper
-		 */
-		return ((user != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
+		ConfigReader conf;
+		AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
+	}
+
+	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	{
+		/* 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;
 	}
 };