X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=28bbd056ec8846f77ef8542ebab12dade995afcd;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;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..28bbd056e 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
@@ -36,7 +34,8 @@ class cmd_jumpserver : public command_t
 	{
 		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;
 	}
@@ -59,12 +58,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++)
 		{
@@ -93,7 +92,7 @@ class cmd_jumpserver : public command_t
 				userrec* t = *i;
 				if (!IS_OPER(t))
 				{
-					t->WriteServ("010 %s %s %s :%s", user->nick, parameters[0], parameters[1], reason.c_str());
+					t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]);
 					userrec::QuitUser(ServerInstance, t, reason);
 					n_done++;
 				}
@@ -128,7 +127,7 @@ class ModuleJumpServer : public Module
 	cmd_jumpserver*	js;
  public:
 	ModuleJumpServer(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		js = new cmd_jumpserver(ServerInstance);
@@ -143,7 +142,7 @@ class ModuleJumpServer : public Module
 	{
 		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());
+			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);
 			return 0;
 		}
@@ -162,27 +161,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)