X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=8ca14f1a4123d2cd21d3e6ad5106757868d32de0;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;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..8ca14f1a4 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -2,38 +2,28 @@
  *       | Inspire 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.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-#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
 {
  public:
-	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, true) { }
+	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
 			if (!dest->IsModeSet('I'))
@@ -50,69 +40,70 @@ class HideChans : public ModeHandler
 				return MODEACTION_ALLOW;
 			}
 		}
-		
+
 		return MODEACTION_DENY;
 	}
 };
 
 class ModuleHideChans : public Module
 {
-	
+	bool AffectsOpers;
 	HideChans* hm;
  public:
-	ModuleHideChans(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleHideChans(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		hm = new HideChans(ServerInstance);
-		ServerInstance->AddMode(hm, 'I');
+		if (!ServerInstance->Modes->AddMode(hm))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+		OnRehash(NULL);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnWhoisLine] = 1;
-	}
-	
 	virtual ~ModuleHideChans()
 	{
 		ServerInstance->Modes->DelMode(hm);
-		DELETE(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);
 	}
 
-	int OnWhoisLine(userrec* user, userrec* 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->oper) && (numeric == 319) && dest->IsModeSet('I'));
+		ConfigReader conf(ServerInstance);
+		AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
 	}
-};
 
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-	ModuleHideChansFactory()
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
+		/* 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;
 	}
-	
-	~ModuleHideChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideChans(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans)