Match conversion stuff.

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

diff --git a/src/modules/m_spanningtree/override_motd.cpp b/src/modules/m_spanningtree/override_motd.cpp
index df8331cb7b88869f98553f024eb08d9a435272a1..0ed8417fafa8f9e00134106c21dacabf7294e9b8 100644 (file)
--- a/src/modules/m_spanningtree/override_motd.cpp
+++ b/src/modules/m_spanningtree/override_motd.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,32 +12,26 @@
  */
 
 /* $ModDesc: Provides a spanning tree server link protocol */
-               
+
 #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 "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.h"
+#include "xline.h"
+#include "transport.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/rconnect.h"
-#include "m_spanningtree/rsquit.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 m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleMotd(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleMotd(const std::vector<std::string>& parameters, User* user)
 {
-       if (pcnt > 0)
+       if (parameters.size() > 0)
        {
-               if (match(ServerInstance->Config->ServerName, parameters[0]))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
                        return 0;
 
                /* Remote MOTD, the server is within the 1st parameter */
@@ -51,7 +45,7 @@ int ModuleSpanningTree::HandleMotd(const char** parameters, int pcnt, userrec* u
                        Utils->DoOneToOne(user->uuid, "MOTD", params, s->GetName());
                }
                else
-                       user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+                       user->WriteNumeric(ERR_NOSUCHSERVER, "%s %s :No such server", user->nick.c_str(), parameters[0].c_str());
                return 1;
        }
        return 0;