X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setname.cpp;h=fb439db6f51be16f29e096515f0400cd39e392d7;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=8661d9f2cb935527fffb760c4e3781db20fa8063;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 8661d9f2c..fb439db6f 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETNAME command */
@@ -30,17 +24,28 @@ class cmd_setname : public command_t
 	{
 		this->source = "m_setname.so";
 		syntax = "<new-gecos>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		std::string line = "";
-		for (int i = 0; i < pcnt-1; i++)
+		if (!*parameters[0])
+		{
+			user->WriteServ("NOTICE %s :*** SETNAME: GECOS must be specified", user->nick);
+			return CMD_FAILURE;
+		}
+		
+		if (strlen(parameters[0]) > MAXGECOS)
+		{
+			user->WriteServ("NOTICE %s :*** SETNAME: GECOS too long", user->nick);
+			return CMD_FAILURE;
+		}
+		
+		if (user->ChangeName(parameters[0]))
 		{
-			line = line + std::string(parameters[i]) + " ";
+			ServerInstance->WriteOpers("%s used SETNAME to change their GECOS to %s", user->nick, parameters[0]);
+			return CMD_SUCCESS;
 		}
-		line = line + std::string(parameters[pcnt-1]);
-		user->ChangeName(line.c_str());
 
 		return CMD_SUCCESS;
 	}
@@ -65,34 +70,9 @@ class ModuleSetName : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetNameFactory : public ModuleFactory
-{
- public:
-	ModuleSetNameFactory()
-	{
-	}
-	
-	~ModuleSetNameFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetName(Me);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSetNameFactory;
-}
-
+MODULE_INIT(ModuleSetName)