Merge pull request #1359 from genius3000/insp20+sasl_no_server

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

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index 9969fdca713bcfc85b253b2311e55cc2135064a3..92999b422bb852d663132367f89d91dc1dd96b0e 100644 (file)
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.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) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
- * 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 "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -32,16 +37,16 @@ bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
        if (params.size() < 2)
                return true;
 
-       User* u = this->ServerInstance->FindNick(params[0]);
+       User* u = ServerInstance->FindNick(params[0]);
        time_t ts = atol(params[1].c_str());
 
-       if (u && u->age == ts)
+       if ((u) && (!IS_SERVER(u)) && (u->age == ts))
        {
                Utils->DoOneToAllButSender(prefix,"SAVE",params,prefix);
 
                if (!u->ForceNickChange(u->uuid.c_str()))
                {
-                       this->ServerInstance->Users->QuitUser(u, "Nickname collision");
+                       ServerInstance->Users->QuitUser(u, "Nickname collision");
                }
        }