X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=4b3504872e43fffc3d4c5e24e412f2398e0c9cc4;hb=92796ffe6430162a9cb70f1361aaa9ca64645c90;hp=e5710d5944154c51895830da0a7d66984938e4c1;hpb=e21ee18e62aecee6d27a0f9ba497a52688cb8349;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index e5710d594..4b3504872 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -40,45 +40,68 @@ class HideChans : public ModeHandler
 				return MODEACTION_ALLOW;
 			}
 		}
-		
+
 		return MODEACTION_DENY;
 	}
 };
 
 class ModuleHideChans : public Module
 {
-	
+	bool AffectsOpers;
 	HideChans* hm;
  public:
-	ModuleHideChans(InspIRCd* Me)
-		: Module(Me)
+	ModuleHideChans(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		hm = new HideChans(ServerInstance);
 		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(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+	}
+
+	virtual void OnRehash(User* user, const std::string &parameter)
+	{
+		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;
 	}
 };