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 6c3dba88ff5ac3d1edd1db3c33dd7a779d0b001a..008c622086efc8caf14147480de27d4ef194b5df 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -1,48 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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, Module* Creator) : ModeHandler(Creator, 'I', PARAM_NONE, MODETYPE_USER) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               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
@@ -50,29 +35,30 @@ class ModuleHideChans : public Module
        bool AffectsOpers;
        HideChans hm;
  public:
-       ModuleHideChans(InspIRCd* Me) : Module(Me), hm(Me, this)
+       ModuleHideChans() : hm(this)
+       {
+       }
+
+       void init()
        {
-               if (!ServerInstance->Modes->AddMode(&hm))
-                       throw ModuleException("Could not add new modes!");
+               ServerInstance->Modules->AddService(hm);
                Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
        virtual ~ModuleHideChans()
        {
-               ServerInstance->Modes->DelMode(&hm);
        }
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for hiding channels with user mode +I", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
        }
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader conf(ServerInstance);
-               AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
+               AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
        }
 
        ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)