* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
class SeeWhois : public ModeHandler
{
public:
- SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
+ SeeWhois(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, "showwhois", 'W', PARAM_NONE, MODETYPE_USER)
+ {
+ oper = IsOpersOnly;
+ }
- 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 WhoisNoticeCmd : public Command
+{
+ public:
+ WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+ {
+ 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());
+ }
+
+ CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
+ {
+ User* dest = ServerInstance->FindNick(parameters[0]);
+ 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() : cmd(this)
{
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
- sw = new SeeWhois(ServerInstance, OpersOnly);
+ sw = new SeeWhois(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()
{
- 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 OnWhois(User* source, User* dest)
+ void OnWhois(User* source, User* dest)
{
- if ((dest->IsModeSet('W')) && (source != dest))
- {
- if (!ShowWhoisFromOpers && IS_OPER(source))
- return;
-
- std::string wmsg = "*** ";
- wmsg += source->nick + " (" + source->ident + "@";
-
- /* XXX HasPrivPermission doesn't work correctly for remote users */
- if (IS_LOCAL(dest) && dest->HasPrivPermission("users/auspex"))
- {
- wmsg += source->host;
- }
- else
- {
- wmsg += source->dhost;
- }
+ if (!dest->IsModeSet('W') || source == dest)
+ return;
- wmsg += ") did a /whois on you";
+ if (!ShowWhoisFromOpers && (!IS_OPER(source) != !IS_OPER(dest)))
+ return;
- 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);
- }
+ if (IS_LOCAL(dest))
+ {
+ cmd.HandleFast(dest, source);
+ }
+ else
+ {
+ std::vector<std::string> params;
+ params.push_back(dest->server);
+ params.push_back("WHOISNOTICE");
+ params.push_back(source->uuid);
+ params.push_back(dest->uuid);
+ ServerInstance->PI->SendEncapsulatedData(params);
}
}