DOH! Fix my muppetry of a segfault, and fix some warnings

[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 44d503ff3fbd51256e9473da3de14a27aaae6fd9..0788a1eaf234f97c47a5767908094bb3eefd8c91 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for hiding channels with user mode +I */
 
@@ -25,12 +22,8 @@ class HideChans : public ModeHandler
  public:
        HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
 
-       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, bool)
        {
-               /* Only opers can change other users modes */
-               if (source != dest)
-                       return MODEACTION_DENY;
-
                if (adding)
                {
                        if (!dest->IsModeSet('I'))
@@ -62,27 +55,25 @@ class ModuleHideChans : public Module
        {
                
                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 };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhoisLine] = 1;
-       }
        
        virtual ~ModuleHideChans()
        {
                ServerInstance->Modes->DelMode(hm);
-               DELETE(hm);
+               delete hm;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+       int 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
@@ -92,4 +83,4 @@ class ModuleHideChans : public Module
 };
 
 
-MODULE_INIT(ModuleHideChans);
+MODULE_INIT(ModuleHideChans)