Merge branch 'insp20' into master.

[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 5091e111006278240693ec7875092f7bd31b71e1..efe7028b77e50da8484e1f29192b2a7a2fd14297 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -1,19 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 SETNAME command */
+#include "inspircd.h"
 
 
 
@@ -22,28 +28,21 @@ class CommandSetname : public Command
  public:
        CommandSetname(Module* Creator) : Command(Creator,"SETNAME", 1, 1)
        {
-               syntax = "<new-gecos>";
-               TRANSLATE2(TR_TEXT, TR_END);
+               allow_empty_last_param = false;
+               syntax = "<new real name>";
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (parameters.size() == 0)
-               {
-                       user->WriteServ("NOTICE %s :*** SETNAME: GECOS must be specified", user->nick.c_str());
-                       return CMD_FAILURE;
-               }
-
-               if (parameters[0].size() > ServerInstance->Config->Limits.MaxGecos)
+               if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal)
                {
-                       user->WriteServ("NOTICE %s :*** SETNAME: GECOS too long", user->nick.c_str());
+                       user->WriteNotice("*** SETNAME: Real name is too long");
                        return CMD_FAILURE;
                }
 
-               if (user->ChangeName(parameters[0].c_str()))
+               if (user->ChangeRealName(parameters[0]))
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their GECOS to %s", user->nick.c_str(), parameters[0].c_str());
-                       return CMD_SUCCESS;
+                       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;
@@ -57,15 +56,10 @@ class ModuleSetName : public Module
  public:
        ModuleSetName()
                : cmd(this)
-       {
-               ServerInstance->AddCommand(&cmd);
-       }
-
-       virtual ~ModuleSetName()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the SETNAME command", VF_VENDOR);
        }