* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class SeeWhois : public ModeHandler
{
public:
- SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
+ SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
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('W'))
class ModuleShowwhois : public Module
{
-
+ bool ShowWhoisFromOpers;
SeeWhois* sw;
public:
ModuleShowwhois(InspIRCd* Me) : Module(Me)
{
+ ConfigReader conf(ServerInstance);
+ bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
+ ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
- sw = new SeeWhois(ServerInstance);
+ sw = new SeeWhois(ServerInstance, OpersOnly);
if (!ServerInstance->Modes->AddMode(sw))
throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnWhois };
delete sw;
}
-
virtual Version GetVersion()
{
return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
{
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;
+ }
+
+ wmsg += ") did a /whois on you";
+
if (IS_LOCAL(dest))
{
- dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.", dest->nick.c_str(), source->nick.c_str(), source->ident.c_str(), source->host.c_str());
+ dest->WriteServ("NOTICE %s :%s", dest->nick.c_str(), wmsg.c_str());
}
else
{
- std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host.c_str() + ") did a /whois on you.";
+ std::string msg = std::string("::") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
ServerInstance->PI->PushToClient(dest, msg);
}
}