X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=dce8f0bd5dfcf2856f184cdb6495b244e636733a;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=9a171a19a3461e64cf36782e75335c19c19d7adb;hpb=3af9c3f8950f864bcf9cdd56127cd4014827dece;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 9a171a19a..dce8f0bd5 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -28,9 +28,7 @@
 class CommandJumpserver : public Command
 {
  public:
-	bool redirect_all_immediately;
 	bool redirect_new_users;
-	bool direction;
 	std::string redirect_to;
 	std::string reason;
 	int port;
@@ -38,19 +36,17 @@ class CommandJumpserver : public Command
 	CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
 	{
 		flags_needed = 'o'; syntax = "[<server> <port> <+/-an> <reason>]";
-		redirect_to.clear();
-		reason.clear();
 		port = 0;
-		redirect_all_immediately = redirect_new_users = false;
+		redirect_new_users = false;
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		int n_done = 0;
 		reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
-		redirect_all_immediately = false;
+		bool redirect_all_immediately = false;
 		redirect_new_users = true;
-		direction = true;
+		bool direction = true;
 		std::string n_done_s;
 
 		/* No parameters: jumpserver disabled */
@@ -59,7 +55,7 @@ class CommandJumpserver : public Command
 			if (port)
 				user->WriteServ("NOTICE %s :*** Disabled jumpserver (previously set to '%s:%d')", user->nick.c_str(), redirect_to.c_str(), port);
 			else
-				user->WriteServ("NOTICE %s :*** jumpserver was not enabled.", user->nick.c_str());
+				user->WriteServ("NOTICE %s :*** Jumpserver was not enabled.", user->nick.c_str());
 
 			port = 0;
 			redirect_to.clear();
@@ -71,7 +67,7 @@ class CommandJumpserver : public Command
 
 		if (parameters.size() >= 3)
 		{
-			for (const char* n = parameters[2].c_str(); *n; n++)
+			for (std::string::const_iterator n = parameters[2].begin(); n != parameters[2].end(); ++n)
 			{
 				switch (*n)
 				{
@@ -103,12 +99,12 @@ class CommandJumpserver : public Command
 			if (redirect_all_immediately)
 			{
 				/* Redirect everyone but the oper sending the command */
-				for (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+				for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
 				{
 					User* t = *i;
 					if (!IS_OPER(t))
 					{
-						t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str());
+						t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", t->nick.c_str(), parameters[0].c_str(), parameters[1].c_str());
 						ServerInstance->Users->QuitUser(t, reason);
 						n_done++;
 					}
@@ -145,9 +141,13 @@ class ModuleJumpServer : public Module
  public:
 	ModuleJumpServer() : js(this)
 	{
-		ServerInstance->AddCommand(&js);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(js);
 		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleJumpServer()