* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
public:
HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
- /* Only opers can change other users modes */
- if (source != dest)
- return MODEACTION_DENY;
-
if (adding)
{
if (!dest->IsModeSet('I'))
return MODEACTION_ALLOW;
}
}
-
+
return MODEACTION_DENY;
}
};
class ModuleHideChans : public Module
{
-
+ bool AffectsOpers;
HideChans* hm;
public:
- ModuleHideChans(InspIRCd* Me)
- : Module(Me)
+ ModuleHideChans(InspIRCd* Me) : Module(Me)
{
-
+
hm = new HideChans(ServerInstance);
- if (!ServerInstance->AddMode(hm))
+ if (!ServerInstance->Modes->AddMode(hm))
throw ModuleException("Could not add new modes!");
+ Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+ OnRehash(NULL, "");
}
- 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("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ }
+
+ virtual void OnRehash(User* user, const std::string ¶meter)
+ {
+ ConfigReader conf(ServerInstance);
+ AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
}
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) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
+ /* always show to self */
+ if (user == dest)
+ return 0;
+
+ /* don't touch anything except 319 */
+ if (numeric != 319)
+ return 0;
+
+ /* don't touch if -I */
+ if (!dest->IsModeSet('I'))
+ return 0;
+
+ /* if it affects opers, we don't care if they are opered */
+ if (AffectsOpers)
+ return 1;
+
+ /* doesn't affect opers, sender is opered */
+ if (user->HasPrivPermission("users/auspex"))
+ return 0;
+
+ /* user must be opered, boned. */
+ return 1;
}
};