X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=3f02d543703362c3a95c38c15acdd4803caff64d;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=7f0b289b6893b12234cabfc4242c6e594381dc54;hpb=b5c1cf4e2cbb3b47134e26e63bbebc3f5d77e150;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 7f0b289b6..3f02d5437 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,9 +20,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)
 		{
@@ -48,60 +48,56 @@ class HideChans : public ModeHandler
 class ModuleHideChans : public Module
 {
 	bool AffectsOpers;
-	HideChans* hm;
+	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, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
-		OnRehash(NULL, "");
+		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);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
-		ConfigReader conf(ServerInstance);
+		ConfigReader conf;
 		AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
 	}
 
-	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* always show to self */
 		if (user == dest)
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		/* don't touch anything except 319 */
 		if (numeric != 319)
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		/* don't touch if -I */
 		if (!dest->IsModeSet('I'))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		/* if it affects opers, we don't care if they are opered */
 		if (AffectsOpers)
-			return 1;
+			return MOD_RES_DENY;
 
 		/* doesn't affect opers, sender is opered */
 		if (user->HasPrivPermission("users/auspex"))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		/* user must be opered, boned. */
-		return 1;
+		return MOD_RES_DENY;
 	}
 };