X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fmodules%2Fextra%2Fm_sslinfo.cpp;h=5c4e5072191c5473ebe8217f26bcefafaae6538c;hb=517a26252a091eaee0149458a86fc43731bce618;hp=ea5764d2d483b4aa2a6912e6a803477bd9d0bdcb;hpb=4f20c13f6fcc038e5312a3548164a104f3a64c94;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index ea5764d2d..5c4e50721 100644
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -2,46 +2,39 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "ssl.h"
-#include "wildcard.h"
-#include "inspircd.h"
+#include "transport.h"
 #include "dns.h"
 
 /* $ModDesc: Provides /sslinfo command used to test who a mask matches */
-/* $ModDep: ssl.h */
+/* $ModDep: transport.h */
 
 /** Handle /SSLINFO
  */
-class cmd_sslinfo : public command_t
+class cmd_sslinfo : public Command
 {
  public:
-	cmd_sslinfo (InspIRCd* Instance) : command_t(Instance,"SSLINFO", 0, 1)
+	cmd_sslinfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
 	{
 		this->source = "m_sslinfo.so";
 		this->syntax = "<nick>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		userrec* target = ServerInstance->FindNick(parameters[0]);
+		User* target = ServerInstance->FindNick(parameters[0]);
 		ssl_cert* cert;
 
 		if (target)
@@ -50,21 +43,21 @@ class cmd_sslinfo : public command_t
 			{
 				if (cert->GetError().length())
 				{
-					user->WriteServ("NOTICE %s :*** Error:             %s", user->nick, cert->GetError().c_str());
+					user->WriteServ("NOTICE %s :*** Error:             %s", user->nick.c_str(), cert->GetError().c_str());
 				}
-				user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick, cert->GetDN().c_str());
-				user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick, cert->GetIssuer().c_str());
-				user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick, cert->GetFingerprint().c_str());
+				user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick.c_str(), cert->GetDN().c_str());
+				user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick.c_str(), cert->GetIssuer().c_str());
+				user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick.c_str(), cert->GetFingerprint().c_str());
 				return CMD_SUCCESS;
 			}
 			else
 			{
-				user->WriteServ("NOTICE %s :*** No SSL certificate information for this user.", user->nick);
+				user->WriteServ("NOTICE %s :*** No SSL certificate information for this user.", user->nick.c_str());
 				return CMD_FAILURE;
 			}
 		}
 		else
-			user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
 
 		return CMD_FAILURE;
 	}
@@ -75,49 +68,24 @@ class ModuleSSLInfo : public Module
 	cmd_sslinfo* newcommand;
  public:
 	ModuleSSLInfo(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
+
 		newcommand = new cmd_sslinfo(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
-	}
 
-	void Implements(char* List)
-	{
 	}
 
+
 	virtual ~ModuleSSLInfo()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
-};
-
 
-class ModuleSSLInfoFactory : public ModuleFactory
-{
- public:
-	ModuleSSLInfoFactory()
-	{
-	}
-	
-	~ModuleSSLInfoFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleSSLInfo(Me);
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSSLInfoFactory;
-}
+MODULE_INIT(ModuleSSLInfo)