X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=82a94fadc82b581700952a4e90c37ae403bf1708;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=32d37f2a083791d6e7a4b2b3f6c2e7e4ab9c2c6c;hpb=ec7fc489a14af54738da17a94b162a9606df4756;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 32d37f2a0..82a94fadc 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,54 +14,85 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
 
-Server *Srv;
-	 
-void handle_chghost(char **parameters, int pcnt, userrec *user)
+static Server *Srv;
+
+class cmd_chghost : public command_t
 {
-	for (int x = 0; x < strlen(parameters[1]); x++)
+ public:
+	cmd_chghost () : command_t("CHGHOST",'o',2)
+	{
+		this->source = "m_chghost.so";
+		syntax = "<nick> <newhost>";
+	}
+	 
+	void Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		if (((tolower(parameters[1][x]) < 'a') || (tolower(parameters[1][x]) > 'z')) && (parameters[1][x] != '.'))
+		const char * x = parameters[1];
+
+		for (; *x; x++)
 		{
-			if (((parameters[1][x] < '0') || (parameters[1][x]> '9')) && (parameters[1][x] != '-'))
+			if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
 			{
-				Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-				return;
+				if (((*x < '0') || (*x > '9')) && (*x != '-'))
+				{
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+					return;
+				}
+			}
+		}
+		if ((parameters[1] - x) > 63)
+		{
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long",user->nick);
+			return;
+		}
+		userrec* dest = Srv->FindNick(std::string(parameters[0]));
+		if (dest)
+		{
+			Srv->ChangeHost(dest,parameters[1]);
+			if (!Srv->IsUlined(user->server))
+			{
+				// fix by brain - ulines set hosts silently
+				Srv->SendOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+std::string(dest->nick)+" become "+std::string(parameters[1]));
 			}
 		}
-	}	userrec* dest = Srv->FindNick(std::string(parameters[0]));
-	if (dest)
-	{
-		Srv->ChangeHost(dest,parameters[1]);
-		Srv->SendOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+std::string(dest->nick)+" become "+std::string(parameters[1]));
 	}
-}
+};
 
 
 class ModuleChgHost : public Module
 {
+	cmd_chghost* mycommand;
  public:
-	ModuleChgHost()
+	ModuleChgHost(Server* Me)
+		: Module::Module(Me)
+	{
+		Srv = Me;
+		mycommand = new cmd_chghost();
+		Srv->AddCommand(mycommand);
+	}
+
+	void Implements(char* List)
 	{
-		Srv = new Server;
-		Srv->AddCommand("CHGHOST",handle_chghost,'o',2,"m_chghost.so");
 	}
 	
 	virtual ~ModuleChgHost()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,2,0,1,VF_VENDOR);
 	}
 	
 };
@@ -79,9 +110,9 @@ class ModuleChgHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleChgHost;
+		return new ModuleChgHost(Me);
 	}
 	
 };