X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hidechans.cpp;h=42614e937c877605fc2f272bb1ece6e9d5c8477e;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=d7438d877db039fa61cac2bba64d2c1cb1a18ff0;hpb=59aa01f8f7738eab12948033ad0a92a568ea7996;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp index d7438d877..42614e937 100644 --- a/src/modules/m_hidechans.cpp +++ b/src/modules/m_hidechans.cpp @@ -11,9 +11,6 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /* $ModDesc: Provides support for hiding channels with user mode +I */ @@ -25,7 +22,7 @@ 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 ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* Only opers can change other users modes */ if (source != dest) @@ -58,11 +55,11 @@ class ModuleHideChans : public Module HideChans* hm; public: ModuleHideChans(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { hm = new HideChans(ServerInstance); - if (!ServerInstance->AddMode(hm, 'I')) + if (!ServerInstance->AddMode(hm)) throw ModuleException("Could not add new modes!"); } @@ -82,35 +79,14 @@ class ModuleHideChans : public Module return Version(1,1,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 */ - return ((user != dest) && (!*user->oper) && (numeric == 319) && dest->IsModeSet('I')); + return ((user != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I')); } }; -class ModuleHideChansFactory : public ModuleFactory -{ - public: - ModuleHideChansFactory() - { - } - - ~ModuleHideChansFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleHideChans(Me); - } - -}; - -extern "C" void * init_module( void ) -{ - return new ModuleHideChansFactory; -} +MODULE_INIT(ModuleHideChans)