X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=5d01d59831197bba3bb52d7f95cb6c09c765a1db;hb=65627cc9d9f3227ea6dc091dd62a71fbce41a5e2;hp=728b07fc563117074d8de7c7f3c2de6ef3256bd8;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 728b07fc5..5d01d5983 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,32 +1,32 @@
-using namespace std;
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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.
+ *
+ * ---------------------------------------------------
+ */
 
-// showwhois module by typobox43
-// Modified by Craig
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
-
-
+/** Handle user mode +W
+ */
 class SeeWhois : public ModeHandler
 {
  public:
-	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* 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) && (!*source->oper))
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
-			if (!channel->IsModeSet('W'))
+			if (!dest->IsModeSet('W'))
 			{
 				dest->SetMode('W',true);
 				return MODEACTION_ALLOW;
@@ -34,7 +34,7 @@ class SeeWhois : public ModeHandler
 		}
 		else
 		{
-			if (channel->IsModeSet('W'))
+			if (dest->IsModeSet('W'))
 			{
 				dest->SetMode('W',false);
 				return MODEACTION_ALLOW;
@@ -47,62 +47,76 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-	
+
 	SeeWhois* sw;
 
  public:
 
-	ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+	ModuleShowwhois(InspIRCd* Me) : Module(Me)
 	{
-		
-		sw = new SeeWhois(ServerInstance);
-		ServerInstance->AddMode(sw, 'W');
+		sw = NULL;
+		OnRehash(NULL, "");
+		Implementation eventlist[] = { I_OnWhois, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	~ModuleShowwhois()
 	{
-		DELETE(sw);
-	}
-
-	void Implements(char* List)
-	{
-		List[I_OnWhois] = 1;
+		ServerInstance->Modes->DelMode(sw);
+		delete sw;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,3,VF_STATIC);
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnRehash(User *user, const std::string &parameter)
 	{
-		if ((dest->IsModeSet('W')) && (source != dest))
+		ConfigReader conf(ServerInstance);
+		bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true);
+
+		if (sw)
 		{
-			dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+			ServerInstance->Modes->DelMode(sw);
+			delete sw;			
 		}
-	}
 
-};
+		sw = new SeeWhois(ServerInstance, OpersOnly);
+		if (!ServerInstance->Modes->AddMode(sw))
+			throw ModuleException("Could not add new modes!");
+	}
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-	public:
-		ModuleShowwhoisFactory()
+	virtual void OnWhois(User* source, User* dest)
+	{
+		if ((dest->IsModeSet('W')) && (source != dest))
 		{
-		}
+			std::string wmsg = "*** ";
+			wmsg += source->nick + "(" + source->ident + "@";
 
-		~ModuleShowwhoisFactory()
-		{
-		}
+			if (dest->HasPrivPermission("users/auspex"))
+			{
+				wmsg += source->host;
+			}
+			else
+			{
+				wmsg += source->dhost;
+			}
 
-		virtual Module* CreateModule(InspIRCd* Me)
-		{
-			return new ModuleShowwhois(Me);
+			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);
+			}
 		}
+	}
 
 };
 
-extern "C" void* init_module()
-{
-	return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)