X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=398ebf571bda40d549319385a4aed41536d7550a;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=5d01d59831197bba3bb52d7f95cb6c09c765a1db;hpb=65627cc9d9f3227ea6dc091dd62a71fbce41a5e2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 5d01d5983..398ebf571 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -1,119 +1,128 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/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 */ /** Handle user mode +W */ -class SeeWhois : public ModeHandler +class SeeWhois : public SimpleUserModeHandler { public: - SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { } + SeeWhois(Module* Creator, bool IsOpersOnly) : SimpleUserModeHandler(Creator, "showwhois", 'W') + { + oper = IsOpersOnly; + } +}; - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) +class WhoisNoticeCmd : public Command +{ + public: + WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2) { - 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; - } - } + 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()); + } - return MODEACTION_DENY; + CmdResult Handle(const std::vector ¶meters, User *user) + { + User* dest = ServerInstance->FindNick(parameters[0]); + if (!dest) + return CMD_FAILURE; + + User* source = ServerInstance->FindNick(parameters[1]); + + if (IS_LOCAL(dest) && source) + HandleFast(dest, source); + + return CMD_SUCCESS; } }; class ModuleShowwhois : public Module { - + bool ShowWhoisFromOpers; SeeWhois* sw; + WhoisNoticeCmd cmd; public: - ModuleShowwhois(InspIRCd* Me) : Module(Me) + ModuleShowwhois() + : sw(NULL), cmd(this) + { + } + + void init() { - sw = NULL; - OnRehash(NULL, ""); - Implementation eventlist[] = { I_OnWhois, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois"); + + bool OpersOnly = tag->getBool("opersonly", true); + ShowWhoisFromOpers = tag->getBool("showfromopers", true); + + sw = new SeeWhois(this, OpersOnly); + ServerInstance->Modules->AddService(*sw); + ServerInstance->Modules->AddService(cmd); + Implementation eventlist[] = { I_OnWhois }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } ~ModuleShowwhois() { - ServerInstance->Modes->DelMode(sw); delete sw; } - virtual Version GetVersion() + Version GetVersion() { - 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 OnRehash(User *user, const std::string ¶meter) + void OnWhois(User* source, User* dest) { - ConfigReader conf(ServerInstance); - bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true); + if (!dest->IsModeSet('W') || source == dest) + return; - if (sw) + if (!ShowWhoisFromOpers && IS_OPER(source)) + return; + + if (IS_LOCAL(dest)) { - ServerInstance->Modes->DelMode(sw); - delete sw; + cmd.HandleFast(dest, source); } - - sw = new SeeWhois(ServerInstance, OpersOnly); - if (!ServerInstance->Modes->AddMode(sw)) - throw ModuleException("Could not add new modes!"); - } - - virtual void OnWhois(User* source, User* dest) - { - if ((dest->IsModeSet('W')) && (source != dest)) + else { - std::string wmsg = "*** "; - wmsg += source->nick + "(" + source->ident + "@"; - - if (dest->HasPrivPermission("users/auspex")) - { - wmsg += source->host; - } - else - { - wmsg += source->dhost; - } - - wmsg += ") did a /whois on you"; - - if (IS_LOCAL(dest)) - { - dest->WriteServ("NOTICE %s :%s", dest->nick.c_str(), wmsg.c_str()); - } - else - { - std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :" + wmsg; - ServerInstance->PI->PushToClient(dest, msg); - } + std::vector params; + params.push_back(dest->server); + params.push_back("WHOISNOTICE"); + params.push_back(dest->uuid); + params.push_back(source->uuid); + ServerInstance->PI->SendEncapsulatedData(params); } }