X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=f63be1381bb2ecee0ebc61142ac4916922280b55;hb=9f69e159adcc0892f0bdef16ac4617630737b156;hp=e9795cc7e580974533080ae454fc59113e467bb0;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index e9795cc7e..f63be1381 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,85 +1,87 @@
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
-
-/* $ModDesc: Provides support for the SETIDENT command */
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 
+#include "inspircd.h"
 
+/* $ModDesc: Provides support for the SETIDENT command */
 
-class cmd_setident : public command_t
+/** Handle /SETIDENT
+ */
+class CommandSetident : public Command
 {
  public:
- cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1)
+ CommandSetident(Module* Creator) : Command(Creator,"SETIDENT", 1)
 	{
-		this->source = "m_setident.so";
-		syntax = "<new-ident>";
+		allow_empty_last_param = false;
+		flags_needed = 'o'; syntax = "<new-ident>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
 	{
-		for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+		if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax)
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		if (!ServerInstance->IsIdent(parameters[0].c_str()))
 		{
-			if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x]))
-				continue;
-			
-			user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-			return;
+			user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick.c_str());
+			return CMD_FAILURE;
 		}
-		
-		ServerInstance->WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]);
-		strlcpy(user->ident, parameters[0], IDENTMAX+2);
+
+		user->ChangeIdent(parameters[0].c_str());
+		ServerInstance->SNO->WriteGlobalSno('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str());
+
+		return CMD_SUCCESS;
 	}
 };
 
 
 class ModuleSetIdent : public Module
 {
-	cmd_setident*	mycommand;
-	
+	CommandSetident cmd;
+
  public:
-	ModuleSetIdent(InspIRCd* Me) : Module::Module(Me)
-	{
-		
-		mycommand = new cmd_setident(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSetIdent()
+	ModuleSetIdent() : cmd(this)
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_VENDOR);
-	}
-	
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetIdentFactory : public ModuleFactory
-{
- public:
-	ModuleSetIdentFactory()
+	void init()
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
-	
-	~ModuleSetIdentFactory()
+
+	virtual ~ModuleSetIdent()
 	{
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleSetIdent(Me);
+		return Version("Provides support for the SETIDENT command", VF_VENDOR);
 	}
-	
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
 
+MODULE_INIT(ModuleSetIdent)