X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_jumpserver.cpp;h=f744a3eead3ff45b4e20c0fd6b1a6bd4e34a75b8;hb=dd36852a52e8541306b76c5b88bce8ab9b36654c;hp=c4c58bde5baf7ddb752bb46eedb52d0163bb1fd3;hpb=52acbb466b84a1cd161b1c111f855d6f0419fff3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index c4c58bde5..f744a3eea 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.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
@@ -12,15 +12,12 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.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;
@@ -30,7 +27,7 @@ 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>]";
@@ -40,7 +37,7 @@ class cmd_jumpserver : public command_t
 		redirect_all_immediately = redirect_new_users = false;
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
 		int n_done = 0;
 		reason = (pcnt < 4) ? "Please use this server/port instead" : parameters[3];
@@ -87,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->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 			{
-				userrec* t = *i;
+				User* t = *i;
 				if (!IS_OPER(t))
 				{
 					t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]);
-					userrec::QuitUser(ServerInstance, t, reason);
+					User::QuitUser(ServerInstance, t, reason);
 					n_done++;
 				}
 			}
@@ -124,35 +121,33 @@ class cmd_jumpserver : public command_t
 
 class ModuleJumpServer : public Module
 {
-	cmd_jumpserver*	js;
+	CommandJumpserver*	js;
  public:
 	ModuleJumpServer(InspIRCd* 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 :Please use this Server/Port instead", user->nick, js->redirect_to.c_str(), js->port);
-			userrec::QuitUser(ServerInstance, user, js->reason);
+			User::QuitUser(ServerInstance, user, js->reason);
 			return 0;
 		}
 		return 0;
 	}
 
-	virtual void Implements(char* List)
-	{
-		List[I_OnUserRegister] = 1;
-	}
 
 	virtual Version GetVersion()
 	{
@@ -161,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" DllExport void * init_module( void )
-{
-	return new ModuleJumpServerFactory;
-}
-
+MODULE_INIT(ModuleJumpServer)