...because every now and again, i have to do a massive commit.

[user/henk/code/inspircd.git] / src / modules / m_hidechans.cpp

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 766e76f8f9a1ef6265037b7a9885fc8765b7e9aa..b8c3be4719abd1302f51eb0f00f08df694642814 100644 (file)
--- 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)
                {
@@ -47,38 +47,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_COMMON | VF_VENDOR);
+       }
+
+       virtual void OnRehash(User* user)
+       {
+               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)
        {
-               /* 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 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;
        }
 };