Merge pull request #96 from Justasic/insp20

[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 976d8bb4978636f603babfe7f34041cfb282810a..17e2e86054db6561c21c9a816efbdfc6ac13f92d 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -1,20 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for hiding channels with user mode +I */
 
@@ -23,14 +27,10 @@
 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(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               /* Only opers can change other users modes */
-               if (source != dest)
-                       return MODEACTION_DENY;
-
                if (adding)
                {
                        if (!dest->IsModeSet('I'))
@@ -47,70 +47,66 @@ class HideChans : public ModeHandler
                                return MODEACTION_ALLOW;
                        }
                }
-               
+
                return MODEACTION_DENY;
        }
 };
 
 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->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);
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
        }
 
-       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 != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
+               ConfigReader conf;
+               AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
        }
-};
 
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-       ModuleHideChansFactory()
+       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
        {
+               /* 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;
        }
-       
-       ~ModuleHideChansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleHideChans(Me);
-       }
-       
 };
 
 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans)