class HideOper : public ModeHandler
{
public:
- HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
+ HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
+ {
+ oper = true;
+ }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
if (adding)
{
class ModuleHideOper : public Module
{
-
- HideOper* hm;
+ HideOper hm;
public:
- ModuleHideOper(InspIRCd* Me)
- : Module(Me)
+ ModuleHideOper()
+ : hm(this)
{
-
- hm = new HideOper(ServerInstance);
- if (!ServerInstance->Modes->AddMode(hm))
+ if (!ServerInstance->Modes->AddMode(&hm))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnWhoisLine };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
virtual ~ModuleHideOper()
{
- ServerInstance->Modes->DelMode(hm);
- delete hm;
}
virtual Version GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR);
}
- int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+ ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
{
/* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
* person doing the WHOIS is not an oper
*/
if (numeric != 313)
- return 0;
+ return MOD_RES_PASSTHRU;
if (!dest->IsModeSet('H'))
- return 0;
+ return MOD_RES_PASSTHRU;
if (!user->HasPrivPermission("users/auspex"))
- return 1;
+ return MOD_RES_DENY;
- return 0;
+ return MOD_RES_PASSTHRU;
+ }
+
+ void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line)
+ {
+ if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+ {
+ // hide the "*" that marks the user as an oper from the /WHO line
+ std::string::size_type pos = line.find("* ");
+ if (pos != std::string::npos)
+ line.erase(pos);
+ }
}
};