X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_motd.cpp;h=bee75975d41f22a87268878bd9555d8a7681aec7;hb=a02ed18a1a1ae42fd81452b6ca5809fc3430a04c;hp=ce9f5b5e17a39792d1c432dfa94a4df7f176110f;hpb=f087d825a88760d251b8f80b5d50bc98b40fa2ae;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_motd.cpp b/src/modules/m_spanningtree/override_motd.cpp
index ce9f5b5e1..bee75975d 100644
--- a/src/modules/m_spanningtree/override_motd.cpp
+++ b/src/modules/m_spanningtree/override_motd.cpp
@@ -2,58 +2,52 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
+ *	  the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 /* $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 "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"
+#include "xline.h"
+#include "../transport.h"
+
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "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 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 (match(ServerInstance->Config->ServerName, parameters[0]))
-                        return 0;
+	if (parameters.size() > 0)
+	{
+		if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
+			return 0;
 
-                /* Remote MOTD, the server is within the 1st parameter */
-                std::deque<std::string> params;
-                params.push_back(parameters[0]);
-                /* Send it out remotely, generate no reply yet */
-                TreeServer* s = Utils->FindServerMask(parameters[0]);
-                if (s)
-                {
-                        params[0] = s->GetName();
-                        Utils->DoOneToOne(user->uuid, "MOTD", params, s->GetName());
-                }
-                else
-                        user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
-                return 1;
-        }
-        return 0;
+		/* Remote MOTD, the server is within the 1st parameter */
+		parameterlist params;
+		params.push_back(parameters[0]);
+		/* Send it out remotely, generate no reply yet */
+		TreeServer* s = Utils->FindServerMask(parameters[0]);
+		if (s)
+		{
+			params[0] = s->GetName();
+			Utils->DoOneToOne(user->uuid, "MOTD", params, s->GetName());
+		}
+		else
+			user->WriteNumeric(ERR_NOSUCHSERVER, "%s %s :No such server", user->nick.c_str(), parameters[0].c_str());
+		return 1;
+	}
+	return 0;
 }