Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 d73c0e214ca0a5269ed0991f67de715019330ea0..008c622086efc8caf14147480de27d4ef194b5df 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -1,107 +1,90 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 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"
 
 /* $ModDesc: Provides support for hiding channels with user mode +I */
 
 /** Handles user mode +I
  */
-class HideChans : public ModeHandler
+class HideChans : public SimpleUserModeHandler
 {
  public:
-       HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('I'))
-                       {
-                               dest->SetMode('I',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('I'))
-                       {
-                               dest->SetMode('I',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       HideChans(Module* Creator) : SimpleUserModeHandler(Creator, "hidechans", 'I') { }
 };
 
 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))
-                       throw ModuleException("Could not add new modes!");
+       void init()
+       {
+               ServerInstance->Modules->AddService(hm);
                Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-               OnRehash(NULL, "");
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               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);
-               AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
+               AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
        }
 
-       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 (IS_OPER(user))
-                       return 0;
+               if (user->HasPrivPermission("users/auspex"))
+                       return MOD_RES_PASSTHRU;
 
                /* user must be opered, boned. */
-               return 1;
+               return MOD_RES_DENY;
        }
 };