X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=04834634d278039320c97cefcff80d0bd7d66673;hb=fcafba14c5408360ec725ed1649ede75b7ae52c1;hp=99887952cf69604a2bdc4bc650ced9d570ebbbb5;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 99887952c..04834634d 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -2,8 +2,8 @@
  *       | 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.
@@ -20,14 +20,10 @@
 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 &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
-		/* Only opers can change other users modes */
-		if (source != dest)
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
 			if (!dest->IsModeSet('W'))
@@ -51,16 +47,19 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-	
+	bool ShowWhoisFromOpers;
 	SeeWhois* sw;
 
  public:
 
 	ModuleShowwhois(InspIRCd* Me) : Module(Me)
 	{
-		
-		sw = new SeeWhois(ServerInstance);
-		if (!ServerInstance->AddMode(sw))
+		ConfigReader conf(ServerInstance);
+		bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
+		ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
+
+		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);
@@ -72,29 +71,40 @@ class ModuleShowwhois : public Module
 		delete sw;
 	}
 
-
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual 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 + "@";
+
+			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 (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+				dest->WriteServ("NOTICE %s :%s", dest->nick.c_str(), wmsg.c_str());
 			}
 			else
 			{
-				std::deque<std::string> params;
-				params.push_back(dest->nick);
-				std::string msg = ":";
-				msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-				params.push_back(msg);
-				Event ev((char *) &params, NULL, "send_push");
-				ev.Send(ServerInstance);
+				std::string msg = std::string("::") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
+				ServerInstance->PI->PushToClient(dest, msg);
 			}
 		}
 	}