X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setname.cpp;h=846938c8dcabe75f26a520ccb12480c198f27e0f;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=0d6b1d9f3f55237e506e5c6715545e196935ce3f;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 0d6b1d9f3..846938c8d 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -21,37 +21,31 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for the SETNAME command */
-
 
 
 class CommandSetname : public Command
 {
  public:
+	bool notifyopers;
 	CommandSetname(Module* Creator) : Command(Creator,"SETNAME", 1, 1)
 	{
-		syntax = "<new-gecos>";
-		TRANSLATE2(TR_TEXT, TR_END);
+		allow_empty_last_param = false;
+		syntax = ":<realname>";
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		if (parameters.size() == 0)
+		if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal)
 		{
-			user->WriteServ("NOTICE %s :*** SETNAME: GECOS must be specified", user->nick.c_str());
+			user->WriteNotice("*** SETNAME: Real name is too long");
 			return CMD_FAILURE;
 		}
 
-		if (parameters[0].size() > ServerInstance->Config->Limits.MaxGecos)
+		if (user->ChangeRealName(parameters[0]))
 		{
-			user->WriteServ("NOTICE %s :*** SETNAME: GECOS too long", user->nick.c_str());
-			return CMD_FAILURE;
-		}
-
-		if (user->ChangeName(parameters[0].c_str()))
-		{
-			ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their GECOS to %s", user->nick.c_str(), parameters[0].c_str());
-			return CMD_SUCCESS;
+			if (notifyopers)
+				ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their real name to '%s'",
+					user->nick.c_str(), parameters[0].c_str());
 		}
 
 		return CMD_SUCCESS;
@@ -66,16 +60,23 @@ class ModuleSetName : public Module
 	ModuleSetName()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleSetName()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("setname");
+
+		// Whether the module should only be usable by server operators.
+		bool operonly = tag->getBool("operonly");
+		cmd.flags_needed = operonly ? 'o' : 0;
+
+		// Whether a snotice should be sent out when a user changes their real name.
+		cmd.notifyopers = tag->getBool("notifyopers", !operonly);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the SETNAME command", VF_VENDOR);
+		return Version("Provides the SETNAME command", VF_VENDOR);
 	}
 };