X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=ecfa44457f730b3bc4eed39a7a690ba948830b46;hb=53afaa7cadcdf222dcf761441727305f79b4c557;hp=28694403e2b05809fbb9fbae2113ef87c456b254;hpb=4e5347348dd9fedaf4521a784db67300582ffdb3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 28694403e..ecfa44457 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -11,18 +11,13 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
 /** Handle /SAPART
  */
-class cmd_jumpserver : public command_t
+class CommandJumpserver : public Command
 {
  public:
 	bool redirect_all_immediately;
@@ -32,16 +27,17 @@ class cmd_jumpserver : public command_t
 	std::string reason;
 	int port;
 
-	cmd_jumpserver (InspIRCd* Instance) : command_t(Instance, "JUMPSERVER", 'o', 0)
+	CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
 	{
 		this->source = "m_jumpserver.so";
 		syntax = "[<server> <port> <+/-a> :<reason>]";
-		redirect_to = reason = "";
+		redirect_to.clear();
+		reason.clear();
 		port = 0;
 		redirect_all_immediately = redirect_new_users = false;
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		int n_done = 0;
 		reason = (pcnt < 4) ? "Please use this server/port instead" : parameters[3];
@@ -59,12 +55,12 @@ class cmd_jumpserver : public command_t
 				user->WriteServ("NOTICE %s :*** jumpserver was not enabled.", user->nick);
 
 			port = 0;
-			redirect_to = "";
+			redirect_to.clear();
 			return CMD_LOCALONLY;
 		}
 
 		port = 0;
-		redirect_to = "";
+		redirect_to.clear();
 
 		for (const char* n = parameters[2]; *n; n++)
 		{
@@ -88,13 +84,13 @@ class cmd_jumpserver : public command_t
 		if (redirect_all_immediately)
 		{
 			/* Redirect everyone but the oper sending the command */
-			for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+			for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
 			{
-				userrec* t = *i;
+				User* t = *i;
 				if (!IS_OPER(t))
 				{
-					t->WriteServ("010 %s %s %s :%s", user->nick, parameters[0], parameters[1], reason.c_str());
-					userrec::QuitUser(ServerInstance, t, reason);
+					t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]);
+					User::QuitUser(ServerInstance, t, reason);
 					n_done++;
 				}
 			}
@@ -125,35 +121,33 @@ class cmd_jumpserver : public command_t
 
 class ModuleJumpServer : public Module
 {
-	cmd_jumpserver*	js;
+	CommandJumpserver*	js;
  public:
 	ModuleJumpServer(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
-		js = new cmd_jumpserver(ServerInstance);
+		js = new CommandJumpserver(ServerInstance);
 		ServerInstance->AddCommand(js);
+		Implementation eventlist[] = { I_OnUserRegister };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 	
 	virtual ~ModuleJumpServer()
 	{
 	}
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		if (js->port && js->redirect_new_users)
 		{
-			user->WriteServ("010 %s %s %d :%s", user->nick, js->redirect_to.c_str(), js->port, js->reason.c_str());
-			userrec::QuitUser(ServerInstance, user, js->reason);
+			user->WriteServ("010 %s %s %d :Please use this Server/Port instead", user->nick, js->redirect_to.c_str(), js->port);
+			User::QuitUser(ServerInstance, user, js->reason);
 			return 0;
 		}
 		return 0;
 	}
 
-	virtual void Implements(char* List)
-	{
-		List[I_OnUserRegister] = 1;
-	}
 
 	virtual Version GetVersion()
 	{
@@ -162,27 +156,4 @@ class ModuleJumpServer : public Module
 	
 };
 
-class ModuleJumpServerFactory : public ModuleFactory
-{
- public:
-	ModuleJumpServerFactory()
-	{
-	}
-	
-	~ModuleJumpServerFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleJumpServer(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleJumpServerFactory;
-}
-
+MODULE_INIT(ModuleJumpServer)