X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ssl_dummy.cpp;h=9efb9f88d6554e7e571c38a62a0913680d8e5017;hb=caa89fb37c532930805f0b144e3298624ec1adec;hp=69e4da3e1670566e738d81d412e032ac58535026;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ssl_dummy.cpp b/src/modules/m_ssl_dummy.cpp
index 69e4da3e1..9efb9f88d 100644
--- a/src/modules/m_ssl_dummy.cpp
+++ b/src/modules/m_ssl_dummy.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,11 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "modules.h"
 #include "inspircd.h"
 
-
 /* $ModDesc: Makes remote /whoises to SSL servers work on a non-ssl server */
 
 class ModuleSSLDummy : public Module
@@ -24,9 +21,11 @@ class ModuleSSLDummy : public Module
 	char* dummy;
  public:
 	
-	ModuleSSLDummy(InspIRCd* Me)	: Module::Module(Me)
+	ModuleSSLDummy(InspIRCd* Me)	: Module(Me)
 	{
 		
+		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 	
 	virtual ~ModuleSSLDummy()
@@ -38,13 +37,9 @@ class ModuleSSLDummy : public Module
 		return Version(1, 0, 0, 0, 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", dummy))
 		{
@@ -52,7 +47,7 @@ class ModuleSSLDummy : public Module
 		}
 	}
 	
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const 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")
@@ -62,7 +57,7 @@ class ModuleSSLDummy : public Module
 			{
 				// 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");
 			}
 		}
 	}
@@ -72,7 +67,7 @@ class ModuleSSLDummy : public Module
 		// 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, dummy))
 			{
@@ -82,26 +77,4 @@ class ModuleSSLDummy : public Module
 	}
 };
 
-class ModuleSSLDummyFactory : public ModuleFactory
-{
- public:
-	ModuleSSLDummyFactory()
-	{
-	}
-	
-	~ModuleSSLDummyFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSSLDummy(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSSLDummyFactory;
-}
-
+MODULE_INIT(ModuleSSLDummy)