X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ssl_dummy.cpp;h=fd6209aea75f1e79bde92d566d849d398fc6b0ab;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=1c6cd173a9c8c3c9f05a0f31ed2a06cf00ab0840;hpb=2f1e456630bb01373ca0a1c3b707ef09334e7226;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ssl_dummy.cpp b/src/modules/m_ssl_dummy.cpp
index 1c6cd173a..fd6209aea 100644
--- a/src/modules/m_ssl_dummy.cpp
+++ b/src/modules/m_ssl_dummy.cpp
@@ -1,82 +1,75 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *   E-mail:
- *	<brain@chatspike.net>
- *	<Craig@chatspike.net>
- * <omster@gmail.com>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Makes remote /whoises to SSL servers work on a non-ssl server */
 
 class ModuleSSLDummy : public Module
 {
-	Server* Srv;
+
+	char* dummy;
  public:
-	
-	ModuleSSLDummy(Server* Me)	: Module::Module(Me)
+
+	ModuleSSLDummy(InspIRCd* Me)	: Module(Me)
 	{
-		Srv = Me;
+
+		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
+
 	virtual ~ModuleSSLDummy()
 	{
 	}
-		
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnWhois] = 1;
-	}
 
 	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
-		if(dest->GetExt("ssl"))
+		if(dest->GetExt("ssl", dummy))
 		{
-			WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick);
+			ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
 		}
 	}
-	
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, std::string extname)
+
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if(extname == "ssl")
 		{
 			// check if this user has an ssl field to send
-			if(user->GetExt(extname))
+			if(user->GetExt(extname, dummy))
 			{
 				// call this function in the linking module, let it format the data how it
 				// sees fit, and send it on its way. We dont need or want to know how.
-				proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "ON");
+				proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON");
 			}
 		}
 	}
-	
-	virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata)
+
+	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
 	{
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "ssl"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an ssl flag, accept the remote server's
-			if (!dest->GetExt(extname))
+			if (!dest->GetExt(extname, dummy))
 			{
 				dest->Extend(extname, "ON");
 			}
@@ -84,26 +77,4 @@ class ModuleSSLDummy : public Module
 	}
 };
 
-class ModuleSSLDummyFactory : public ModuleFactory
-{
- public:
-	ModuleSSLDummyFactory()
-	{
-	}
-	
-	~ModuleSSLDummyFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleSSLDummy(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSSLDummyFactory;
-}
-
+MODULE_INIT(ModuleSSLDummy)