Introduce "X" snomask for remote *:line messages [patch by jackmcbarn]

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

diff --git a/src/modules/m_spanningtree/admin.cpp b/src/modules/m_spanningtree/admin.cpp
index 0faff3d57d0fd406d065e66f446c5eec2be03b93..133da928ba08569c3e4df5a99901e44bd1b1a5bb 100644 (file)
--- a/src/modules/m_spanningtree/admin.cpp
+++ b/src/modules/m_spanningtree/admin.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.
@@ -14,41 +14,41 @@
 #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 */
 
 /** remote ADMIN. leet, huh? */
-bool TreeSocket::Admin(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::Admin(const std::string &prefix, parameterlist &params)
 {
        if (params.size() > 0)
        {
-               if (this->Instance->MatchText(this->Instance->Config->ServerName, params[0]))
+               if (InspIRCd::Match(this->ServerInstance->Config->ServerName, params[0]))
                {
                        /* It's for our server */
                        string_list results;
-                       User* source = this->Instance->FindNick(prefix);
+                       User* source = this->ServerInstance->FindNick(prefix);
                        if (source)
                        {
-                               std::deque<std::string> par;
+                               parameterlist par;
                                par.push_back(prefix);
                                par.push_back("");
-                               par[1] = std::string("::")+Instance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+Instance->Config->ServerName;
-                               Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
-                               par[1] = std::string("::")+Instance->Config->ServerName+" 257 "+source->nick+" :Name     - "+Instance->Config->AdminName;
-                               Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
-                               par[1] = std::string("::")+Instance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+Instance->Config->AdminNick;
-                               Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
-                               par[1] = std::string("::")+Instance->Config->ServerName+" 258 "+source->nick+" :E-Mail   - "+Instance->Config->AdminEmail;
-                               Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
+                               par[1] = std::string("::")+ServerInstance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+ServerInstance->Config->ServerName;
+                               Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server);
+                               par[1] = std::string("::")+ServerInstance->Config->ServerName+" 257 "+source->nick+" :Name     - "+ServerInstance->Config->AdminName;
+                               Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server);
+                               par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+ServerInstance->Config->AdminNick;
+                               Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server);
+                               par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :E-Mail   - "+ServerInstance->Config->AdminEmail;
+                               Utils->DoOneToOne(this->ServerInstance->Config->GetSID(), "PUSH",par, source->server);
                        }
                }
                else
                {
                        /* Pass it on */
-                       User* source = this->Instance->FindNick(prefix);
+                       User* source = this->ServerInstance->FindNick(prefix);
                        if (source)
                                Utils->DoOneToOne(prefix, "ADMIN", params, params[0]);
                }