X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=7c35fe08e669589398b3e55d4626dae846b3287e;hb=dd283acb933c541ce1be6532f8c6f37528b41c51;hp=85a16bc930cc0e4fffd4c912573cd47da0dbd663;hpb=855f0d98e90a077f46b456e98ebb8a9b290488f6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 85a16bc93..7c35fe08e 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,7 +1,15 @@
-using namespace std;
-
-// showwhois module by typobox43
-// Modified by Craig
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #include "users.h"
 #include "channels.h"
@@ -15,7 +23,7 @@ using namespace std;
 class SeeWhois : public ModeHandler
 {
  public:
-	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -55,7 +63,8 @@ class ModuleShowwhois : public Module
 	{
 		
 		sw = new SeeWhois(ServerInstance);
-		ServerInstance->AddMode(sw, 'W');
+		if (!ServerInstance->AddMode(sw, 'W'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	~ModuleShowwhois()
@@ -71,14 +80,27 @@ class ModuleShowwhois : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(userrec* source, userrec* dest)
 	{
 		if ((dest->IsModeSet('W')) && (source != dest))
 		{
-			dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+			if (IS_LOCAL(dest))
+			{
+				dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+			}
+			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);
+			}
 		}
 	}