Fix SpanningTreeProtocolInterface::SendChannelPrivmsg() and SendChannelNotice() sendi...

[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 f13385fc2c4f9721e29bb4227e651fee7ff2438f..59973202ddc06cc52a73a214648eeeaae45986dc 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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) 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"
@@ -23,20 +30,32 @@ 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;
+
+               // Don't update the TS if the nick is exactly the same
+               if (u->nick == nick)
+                       return CMD_FAILURE;
+
+               time_t NickTS = ConvToInt(parameters[2]);
+               if (NickTS <= 0)
+                       return CMD_FAILURE;
+
+               ModuleSpanningTree* st = (ModuleSpanningTree*)(Module*)creator;
+               st->KeepNickTS = true;
+               u->age = NickTS;
 
-               if (!u->ForceNickChange(parameters[1].c_str()))
+               if (!u->ForceNickChange(nick.c_str()))
                {
                        /* buh. UID them */
                        if (!u->ForceNickChange(u->uuid.c_str()))
                        {
                                ServerInstance->Users->QuitUser(u, "Nickname collision");
-                               return CMD_SUCCESS;
                        }
                }
 
-               u->age = atoi(parameters[2].c_str());
+               st->KeepNickTS = false;
        }
 
        return CMD_SUCCESS;