* ---------------------------------------------------
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
-/* $ModDesc: Provides support for hiding oper status with user mode +I */
+/* $ModDesc: Provides support for hiding channels with user mode +I */
/** Handles user mode +I
*/
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 ¶meter, bool adding)
{
/* Only opers can change other users modes */
- if ((source != dest) && (!*source->oper))
+ if (source != dest)
return MODEACTION_DENY;
if (adding)
HideChans* hm;
public:
ModuleHideChans(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
hm = new HideChans(ServerInstance);
- ServerInstance->AddMode(hm, 'I');
+ if (!ServerInstance->AddMode(hm, 'I'))
+ throw ModuleException("Could not add new modes!");
}
void Implements(char* List)
/* 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'));
+ 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)