X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=96f5ef560911722ea96f2fc05a8beeea8846847c;hb=8085aa879bd989b526791797910295944a364084;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..96f5ef560 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -47,25 +47,21 @@ class HideChans : public ModeHandler
 
 class ModuleHideChans : public Module
 {
-
-	HideChans* hm;
+	bool AffectsOpers;
+	HideChans hm;
  public:
-	ModuleHideChans(InspIRCd* Me)
-		: Module(Me)
+	ModuleHideChans(InspIRCd* Me) : Module(Me), hm(Me)
 	{
-
-		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;
+		ServerInstance->Modes->DelMode(&hm);
 	}
 
 	virtual Version GetVersion()
@@ -73,12 +69,36 @@ class ModuleHideChans : public Module
 		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
+	virtual void OnRehash(User* user)
+	{
+		ConfigReader conf(ServerInstance);
+		AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
+	}
+
 	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
-		/* 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'));
+		/* always show to self */
+		if (user == dest)
+			return 0;
+
+		/* don't touch anything except 319 */
+		if (numeric != 319)
+			return 0;
+
+		/* don't touch if -I */
+		if (!dest->IsModeSet('I'))
+			return 0;
+
+		/* if it affects opers, we don't care if they are opered */
+		if (AffectsOpers)
+			return 1;
+
+		/* doesn't affect opers, sender is opered */
+		if (user->HasPrivPermission("users/auspex"))
+			return 0;
+
+		/* user must be opered, boned. */
+		return 1;
 	}
 };