Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/motd.cpp b/src/modules/m_spanningtree/motd.cpp
index ae5c61c9f9817d50d18487fe93ceaf599c8a79a6..0c775d6442e5e6bfe0e7854453311f16eb8d263a 100644 (file)
--- a/src/modules/m_spanningtree/motd.cpp
+++ b/src/modules/m_spanningtree/motd.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.
@@ -12,65 +12,57 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
-#include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
+
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 
 /** remote MOTD. leet, huh? */
-bool TreeSocket::Motd(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::Motd(const std::string &prefix, parameterlist &params)
 {
        if (params.size() > 0)
        {
-               if (this->Instance->MatchText(this->Instance->Config->ServerName, params[0]))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
                {
                        /* It's for our server */
                        string_list results;
-                       User* source = this->Instance->FindNick(prefix);
+                       User* source = ServerInstance->FindNick(prefix);
 
                        if (source)
                        {
-                               std::deque<std::string> par;
+                               parameterlist par;
                                par.push_back(prefix);
                                par.push_back("");
 
-                               if (!Instance->Config->MOTD.size())
+                               if (!ServerInstance->Config->MOTD.size())
                                {
-                                       par[1] = std::string("::")+Instance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing.";
-                                       Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
+                                       par[1] = std::string("::")+ServerInstance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing.";
+                                       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH",par, source->server);
                                        return true;
                                }
 
-                               par[1] = std::string("::")+Instance->Config->ServerName+" 375 "+source->nick+" :"+Instance->Config->ServerName+" message of the day";
-                               Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
+                               par[1] = std::string("::")+ServerInstance->Config->ServerName+" 375 "+source->nick+" :"+ServerInstance->Config->ServerName+" message of the day";
+                               Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH",par, source->server);
 
-                               for (unsigned int i = 0; i < Instance->Config->MOTD.size(); i++)
+                               for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
                                {
-                                       par[1] = std::string("::")+Instance->Config->ServerName+" 372 "+source->nick+" :- "+Instance->Config->MOTD[i];
-                                       Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
+                                       par[1] = std::string("::")+ServerInstance->Config->ServerName+" 372 "+source->nick+" :- "+ServerInstance->Config->MOTD[i];
+                                       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH",par, source->server);
                                }
 
-                               par[1] = std::string("::")+Instance->Config->ServerName+" 376 "+source->nick+" :End of message of the day.";
-                               Utils->DoOneToOne(this->Instance->Config->GetSID(), "PUSH",par, source->server);
+                               par[1] = std::string("::")+ServerInstance->Config->ServerName+" 376 "+source->nick+" :End of message of the day.";
+                               Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH",par, source->server);
                        }
                }
                else
                {
                        /* Pass it on */
-                       User* source = this->Instance->FindNick(prefix);
+                       User* source = ServerInstance->FindNick(prefix);
                        if (source)
                                Utils->DoOneToOne(prefix, "MOTD", params, params[0]);
                }