Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_showwhois.cpp

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index fac5d124e1bf5f02cb45cd3cd65acad8600c2ab3..783f7d3feafc1b16e3336ea8699cb575e160f770 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,110 +1,123 @@
-/*       +------------------------------------+
- *       | 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 <danieldg@inspircd.org>
+ *   Copyright (C) 2005, 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.com>
  *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
-#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, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
+       SeeWhois(Module* Creator)
+               : SimpleUserModeHandler(Creator, "showwhois", 'W')
+       {
+       }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       void SetOperOnly(bool operonly)
        {
-               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;
-                       }
-               }
+               oper = operonly;
+       }
+};
 
-               return MODEACTION_DENY;
+class WhoisNoticeCmd : public Command
+{
+ public:
+       WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
+       {
+               flags_needed = FLAG_SERVERONLY;
+       }
+
+       void HandleFast(User* dest, User* src)
+       {
+               dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
+                       (dest->HasPrivPermission("users/auspex") ? src->host : src->dhost) +
+                       ") did a /whois on you");
+       }
+
+       CmdResult Handle(const std::vector<std::string> &parameters, 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
 {
-
-       SeeWhois* sw;
+       bool ShowWhoisFromOpers;
+       SeeWhois sw;
+       WhoisNoticeCmd cmd;
 
  public:
 
-       ModuleShowwhois(InspIRCd* Me) : Module(Me)
+       ModuleShowwhois()
+               : sw(this), cmd(this)
        {
-               ConfigReader conf(ServerInstance);
-               bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true);
-
-               sw = new SeeWhois(ServerInstance, OpersOnly);
-               if (!ServerInstance->Modes->AddMode(sw))
-                       throw ModuleException("Could not add new modes!");
-               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(User* source, User* dest) CXX11_OVERRIDE
        {
-               if ((dest->IsModeSet('W')) && (source != dest))
+               if (!dest->IsModeSet(sw) || source == dest)
+                       return;
+
+               if (!ShowWhoisFromOpers && source->IsOper())
+                       return;
+
+               if (IS_LOCAL(dest))
+               {
+                       cmd.HandleFast(dest, source);
+               }
+               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<std::string> params;
+                       params.push_back(dest->server->GetName());
+                       params.push_back("WHOISNOTICE");
+                       params.push_back(dest->uuid);
+                       params.push_back(source->uuid);
+                       ServerInstance->PI->SendEncapsulatedData(params);
                }
        }
-
 };
 
 MODULE_INIT(ModuleShowwhois)
+