Implement feature in bug #395 reported by stealth, and tidy up a bit

[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 3b9a37209b8c35ed4a21f1dc37903564d0eef779..2c3769f7ada7989fb61b462c70139ec75b0784b9 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for hiding channels with user mode +I */
 
@@ -23,12 +23,12 @@
 class HideChans : public ModeHandler
 {
  public:
-       HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, true) { }
+       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)
        {
                /* Only opers can change other users modes */
-               if ((source != dest) && (!*source->oper))
+               if (source != dest)
                        return MODEACTION_DENY;
 
                if (adding)
@@ -58,7 +58,7 @@ class ModuleHideChans : public Module
        HideChans* hm;
  public:
        ModuleHideChans(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                hm = new HideChans(ServerInstance);
@@ -87,30 +87,9 @@ class ModuleHideChans : public Module
                /* Dont display channels if they have +I set and the
                 * person doing the WHOIS is not an oper
                 */
-               return ((!*user->oper) && (numeric == 319) && dest->IsModeSet('I'));
-       }
-};
-
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-       ModuleHideChansFactory()
-       {
+               return ((user != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
        }
-       
-       ~ModuleHideChansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleHideChans(Me);
-       }
-       
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans)