Addendum to previous ping patch: NextPingTime was not being set at endburst, and...

[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 1b8630f66d47a0bdfb8751aa93e22a3cdcef54bc..6a62394c1458d9ee60743ee5f4dd65c78fe9f22e 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -28,11 +28,11 @@ bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &par
 
        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();
@@ -40,9 +40,9 @@ bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &par
 
 
        /* NOTE: No check needed on 'user', this function safely handles NULL */
-       if (Instance->XLines->DelLine(params[1].c_str(), params[0], 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(),
+               this->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);
        }