X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=14448c72e6f2cdf2e3c85a011d0ad563901c26cb;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=fb8727e3a15076ec6235a6d0ffa7fc7d178c2ba7;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index fb8727e3a..14448c72e 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
@@ -17,7 +17,7 @@
 
 /** Handle /SAPART
  */
-class cmd_jumpserver : public command_t
+class CommandJumpserver : public Command
 {
  public:
 	bool redirect_all_immediately;
@@ -27,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>]";
@@ -37,17 +37,17 @@ 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 std::vector<std::string> &parameters, User *user)
 	{
 		int n_done = 0;
-		reason = (pcnt < 4) ? "Please use this server/port instead" : parameters[3];
+		reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
 		redirect_all_immediately = false;
 		redirect_new_users = true;
 		direction = true;
 		std::string n_done_s;
 
 		/* No parameters: jumpserver disabled */
-		if (!pcnt)
+		if (!parameters.size())
 		{
 			if (port)
 				user->WriteServ("NOTICE %s :*** Disabled jumpserver (previously set to '%s:%d')", user->nick, redirect_to.c_str(), port);
@@ -62,7 +62,7 @@ class cmd_jumpserver : public command_t
 		port = 0;
 		redirect_to.clear();
 
-		for (const char* n = parameters[2]; *n; n++)
+		for (const char* n = parameters[2].c_str(); *n; n++)
 		{
 			switch (*n)
 			{
@@ -84,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);
+					t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", user->nick, parameters[0].c_str(), parameters[1].c_str());
+					ServerInstance->Users->QuitUser(t, reason);
 					n_done++;
 				}
 			}
@@ -103,10 +103,10 @@ class cmd_jumpserver : public command_t
 		if (redirect_new_users)
 		{
 			redirect_to = parameters[0];
-			port = atoi(parameters[1]);
+			port = atoi(parameters[1].c_str());
 		}
 
-		user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick, parameters[0], parameters[1],
+		user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick, parameters[0].c_str(), parameters[1].c_str(),
 				redirect_all_immediately ? "a" : "",
 				redirect_new_users ? "n" : "",
 				n_done ? " (" : "",
@@ -121,39 +121,37 @@ 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->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", user->nick, js->redirect_to.c_str(), js->port);
+			ServerInstance->Users->QuitUser(user, js->reason);
 			return 0;
 		}
 		return 0;
 	}
 
-	virtual void Implements(char* List)
-	{
-		List[I_OnUserRegister] = 1;
-	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };