Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_setname.cpp

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index b8efd98aa35b653360e9fe3f235eb218a1ab07d0..846938c8dcabe75f26a520ccb12480c198f27e0f 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -26,23 +26,26 @@
 class CommandSetname : public Command
 {
  public:
+       bool notifyopers;
        CommandSetname(Module* Creator) : Command(Creator,"SETNAME", 1, 1)
        {
                allow_empty_last_param = false;
-               syntax = "<newname>";
+               syntax = ":<realname>";
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (parameters[0].size() > ServerInstance->Config->Limits.MaxGecos)
+               if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal)
                {
                        user->WriteNotice("*** SETNAME: Real name is too long");
                        return CMD_FAILURE;
                }
 
-               if (user->ChangeName(parameters[0]))
+               if (user->ChangeRealName(parameters[0]))
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their real name to '%s'", user->nick.c_str(), parameters[0].c_str());
+                       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;
@@ -59,9 +62,21 @@ class ModuleSetName : public Module
        {
        }
 
+       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);
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the SETNAME command", VF_VENDOR);
+               return Version("Provides the SETNAME command", VF_VENDOR);
        }
 };