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

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

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index cb8a9dadceccfd2fe8a17771e82a41a89845af88..540ca50792dcf25a4e822fd4dd6182731f0771ed 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -1,48 +1,55 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 
-bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::DelLine(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 2)
                return true;
 
        std::string setter = "<unknown>";
-       User* user = Instance->FindNick(prefix);
+
+       User* user = ServerInstance->FindNick(prefix);
        if (user)
                setter = user->nick;
        else
-        {
+       {
                TreeServer* t = Utils->FindServer(prefix);
                if (t)
-                       setter = t->GetName().c_str();
+                       setter = t->GetName();
        }
 
 
        /* NOTE: No check needed on 'user', this function safely handles NULL */
-       if (Instance->XLines->DelLine(params[0].c_str(), params[1], user))
+       if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
        {
-               this->Instance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", setter.c_str(),
-                               params[0].c_str(), params[0].length() == 1 ? "LINE" : "", params[1].c_str());
+               ServerInstance->SNO->WriteToSnoMask('X',"%s removed %s%s on %s", setter.c_str(),
+                               params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str());
                Utils->DoOneToAllButSender(prefix,"DELLINE", params, prefix);
        }
        return true;