X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=265a0f7753e96a65c3161310e229f60b173bfd90;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=70c9865e17a12c2cdf00f75f8dbbdeb782519de0;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 70c9865e1..265a0f775 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
@@ -25,7 +22,7 @@ class SeeWhois : public ModeHandler
  public:
 	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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		/* Only opers can change other users modes */
 		if (source != dest)
@@ -54,77 +51,49 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-	
+
 	SeeWhois* sw;
 
  public:
 
 	ModuleShowwhois(InspIRCd* Me) : Module(Me)
 	{
-		
+
 		sw = new SeeWhois(ServerInstance);
-		if (!ServerInstance->AddMode(sw, 'W'))
+		if (!ServerInstance->Modes->AddMode(sw))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
 	~ModuleShowwhois()
 	{
 		ServerInstance->Modes->DelMode(sw);
-		DELETE(sw);
+		delete sw;
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnWhois] = 1;
-	}
 
 	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(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		if ((dest->IsModeSet('W')) && (source != dest))
 		{
 			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 (%s@%s) did a /whois on you.", dest->nick.c_str(), source->nick.c_str(), source->ident.c_str(), source->host.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 + " :*** " + source->nick + " (" + source->ident + "@" + source->host.c_str() + ") did a /whois on you.";
+				ServerInstance->PI->PushToClient(dest, msg);
 			}
 		}
 	}
 
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-	public:
-		ModuleShowwhoisFactory()
-		{
-		}
-
-		~ModuleShowwhoisFactory()
-		{
-		}
-
-		virtual Module* CreateModule(InspIRCd* Me)
-		{
-			return new ModuleShowwhois(Me);
-		}
-
-};
-
-extern "C" DllExport void* init_module()
-{
-	return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)