X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=04b5c97c858a440ac5e9c49f872af1d40081cf86;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=ad14c786f0628f2b848ea1a7874c6c8fe8f5dad4;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index ad14c786f..04b5c97c8 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,85 +1,72 @@
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
+/*
+ * 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/>.
+ */
 
-/* $ModDesc: Provides support for the SETIDENT command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+#include "inspircd.h"
 
-class cmd_setident : public command_t
+/** Handle /SETIDENT
+ */
+class CommandSetident : public Command
 {
  public:
-	cmd_setident() : command_t("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 = "<ident>";
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+		if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax)
 		{
-			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->WriteNotice("*** SETIDENT: Ident is too long");
+			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);
-	}
-};
 
+		if (!ServerInstance->IsIdent(parameters[0]))
+		{
+			user->WriteNotice("*** SETIDENT: Invalid characters in ident");
+			return CMD_FAILURE;
+		}
 
-class ModuleSetIdent : public Module
-{
-	cmd_setident*	mycommand;
-	
- public:
-	ModuleSetIdent(InspIRCd* Me) : Module::Module(Me)
-	{
-		
-		mycommand = new cmd_setident();
-		Srv->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSetIdent()
-	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_VENDOR);
+		user->ChangeIdent(parameters[0]);
+		ServerInstance->SNO->WriteGlobalSno('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str());
+
+		return CMD_SUCCESS;
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetIdentFactory : public ModuleFactory
+class ModuleSetIdent : public Module
 {
+	CommandSetident cmd;
+
  public:
-	ModuleSetIdentFactory()
+	ModuleSetIdent() : cmd(this)
 	{
 	}
-	
-	~ModuleSetIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleSetIdent(Me);
+		return Version("Provides the SETIDENT command", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
-
+MODULE_INIT(ModuleSetIdent)