Merge pull request #495 from SaberUK/master+fix-libcpp

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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 742a8e4fbc99dcd9516dc768ea0e802d0d113c45..916dae0a72bdf8c60378f3bacf464b083a41c046 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -1,20 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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"
 
-#include "main.h"
-#include "utils.h"
 #include "commands.h"
 
 CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, User *user)
@@ -23,10 +28,11 @@ CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, Use
 
        if (u && IS_LOCAL(u))
        {
-               parameterlist par;
-               par.push_back(parameters[1]);
+               std::string nick = parameters[1];
+               if (isdigit(nick[0]))
+                       nick = u->uuid;
 
-               if (!u->ForceNickChange(parameters[1].c_str()))
+               if (!u->ForceNickChange(nick.c_str()))
                {
                        /* buh. UID them */
                        if (!u->ForceNickChange(u->uuid.c_str()))
@@ -36,7 +42,7 @@ CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, Use
                        }
                }
 
-               u->age = atoi(parameters[2].c_str());
+               u->age = ConvToInt(parameters[2]);
        }
 
        return CMD_SUCCESS;