X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=3cb85f3fb1b18d502ee393cddbc1c01d9694351f;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=c6e9ed27ce1a3b6fc0d27eb9664f3bdfc7616ed7;hpb=3d8ec5dbd9cfde34fcbc63ad7b9b1369866f0a33;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index c6e9ed27c..3cb85f3fb 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -1,114 +1,110 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2005, 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2004 Christopher Hall * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" -/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */ +#include "inspircd.h" /** Handle user mode +W */ -class SeeWhois : public ModeHandler +class SeeWhois : public SimpleUserModeHandler { public: - SeeWhois(InspIRCd* Instance, Module* Creator, bool IsOpersOnly) : ModeHandler(Instance, Creator, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + SeeWhois(Module* Creator) + : SimpleUserModeHandler(Creator, "showwhois", 'W') { - if (adding) - { - if (!dest->IsModeSet('W')) - { - dest->SetMode('W',true); - return MODEACTION_ALLOW; - } - } - else - { - if (dest->IsModeSet('W')) - { - dest->SetMode('W',false); - return MODEACTION_ALLOW; - } - } + } - return MODEACTION_DENY; + void SetOperOnly(bool operonly) + { + oper = operonly; } }; class WhoisNoticeCmd : public Command { public: - WhoisNoticeCmd(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"WHOISNOTICE", 0, 1) + WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2) { + flags_needed = FLAG_SERVERONLY; } void HandleFast(User* dest, User* src) { - dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you", - dest->nick.c_str(), src->nick.c_str(), src->ident.c_str(), - dest->HasPrivPermission("users/auspex") ? src->host.c_str() : src->dhost.c_str()); + dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" + + (dest->HasPrivPermission("users/auspex") ? src->host : src->dhost) + + ") did a /whois on you"); } CmdResult Handle(const std::vector ¶meters, User *user) { User* dest = ServerInstance->FindNick(parameters[0]); + if (!dest) + return CMD_FAILURE; - if (IS_LOCAL(dest)) - HandleFast(dest, user); + User* source = ServerInstance->FindNick(parameters[1]); + + if (IS_LOCAL(dest) && source) + HandleFast(dest, source); return CMD_SUCCESS; } }; -class ModuleShowwhois : public Module +class ModuleShowwhois : public Module, public Whois::EventListener { bool ShowWhoisFromOpers; - SeeWhois* sw; + SeeWhois sw; WhoisNoticeCmd cmd; public: - ModuleShowwhois(InspIRCd* Me) : Module(Me), cmd(Me, this) + ModuleShowwhois() + : Whois::EventListener(this) + , sw(this) + , cmd(this) { - ConfigReader conf(ServerInstance); - bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0); - ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0); - - sw = new SeeWhois(ServerInstance, this, OpersOnly); - if (!ServerInstance->Modes->AddMode(sw)) - throw ModuleException("Could not add new modes!"); - ServerInstance->AddCommand(&cmd); - Implementation eventlist[] = { I_OnWhois }; - ServerInstance->Modules->Attach(eventlist, this, 1); } - ~ModuleShowwhois() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(sw); - delete sw; + ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois"); + + sw.SetOperOnly(tag->getBool("opersonly", true)); + ShowWhoisFromOpers = tag->getBool("showfromopers", true); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR); } - virtual void OnWhois(User* source, User* dest) + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - if (!dest->IsModeSet('W') || source == dest) + User* const source = whois.GetSource(); + User* const dest = whois.GetTarget(); + if (!dest->IsModeSet(sw) || whois.IsSelfWhois()) return; - if (!ShowWhoisFromOpers && (IS_OPER(source) != IS_OPER(dest))) + if (!ShowWhoisFromOpers && source->IsOper()) return; if (IS_LOCAL(dest)) @@ -118,13 +114,11 @@ class ModuleShowwhois : public Module else { std::vector params; - params.push_back(dest->server); - params.push_back("WHOISNOTICE"); params.push_back(dest->uuid); - ServerInstance->PI->SendEncapsulatedData(params); + params.push_back(source->uuid); + ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params); } } - }; MODULE_INIT(ModuleShowwhois)