X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fprecommand.cpp;h=c43e4e927c12566bb173dfc517a21838791887eb;hb=7e843c22e16c81054bad18073d24fe1a07026431;hp=324aa3e14a9e09cb2b5399e4c752d53cdd1f25c6;hpb=dd36852a52e8541306b76c5b88bce8ab9b36654c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp
index 324aa3e14..c43e4e927 100644
--- a/src/modules/m_spanningtree/precommand.cpp
+++ b/src/modules/m_spanningtree/precommand.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,89 +12,75 @@
  */
 
 /* $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 "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::OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+ModResult ModuleSpanningTree::OnPreCommand(std::string &command, std::vector<std::string>& parameters, User *user, bool validated, const std::string &original_line)
 {
 	/* If the command doesnt appear to be valid, we dont want to mess with it. */
 	if (!validated)
-		return 0;
+		return MOD_RES_PASSTHRU;
 
 	if (command == "CONNECT")
 	{
-		return this->HandleConnect(parameters,pcnt,user);
+		return this->HandleConnect(parameters,user);
 	}
 	else if (command == "STATS")
 	{
-		return this->HandleStats(parameters,pcnt,user);
+		return this->HandleStats(parameters,user);
 	}
 	else if (command == "MOTD")
 	{
-		return this->HandleMotd(parameters,pcnt,user);
+		return this->HandleMotd(parameters,user);
 	}
 	else if (command == "ADMIN")
 	{
-		return this->HandleAdmin(parameters,pcnt,user);
+		return this->HandleAdmin(parameters,user);
 	}
 	else if (command == "SQUIT")
 	{
-		return this->HandleSquit(parameters,pcnt,user);
+		return this->HandleSquit(parameters,user);
 	}
 	else if (command == "MAP")
 	{
-		this->HandleMap(parameters,pcnt,user);
-		return 1;
+		return this->HandleMap(parameters,user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
-	else if ((command == "TIME") && (pcnt > 0))
+	else if ((command == "TIME") && (parameters.size() > 0))
 	{
-		return this->HandleTime(parameters,pcnt,user);
+		return this->HandleTime(parameters,user);
 	}
 	else if (command == "LUSERS")
 	{
-		this->HandleLusers(parameters,pcnt,user);
-		return 1;
+		this->HandleLusers(parameters,user);
+		return MOD_RES_DENY;
 	}
 	else if (command == "LINKS")
 	{
-		this->HandleLinks(parameters,pcnt,user);
-		return 1;
+		this->HandleLinks(parameters,user);
+		return MOD_RES_DENY;
 	}
 	else if (command == "WHOIS")
 	{
-		if (pcnt > 1)
+		if (parameters.size() > 1)
 		{
 			// remote whois
-			return this->HandleRemoteWhois(parameters,pcnt,user);
+			return this->HandleRemoteWhois(parameters,user);
 		}
 	}
-	else if ((command == "VERSION") && (pcnt > 0))
-	{
-		this->HandleVersion(parameters,pcnt,user);
-		return 1;
-	}
-	else if ((command == "MODULES") && (pcnt > 0))
+	else if ((command == "VERSION") && (parameters.size() > 0))
 	{
-		return this->HandleModules(parameters,pcnt,user);
+		this->HandleVersion(parameters,user);
+		return MOD_RES_DENY;
 	}
-	return 0;
+	return MOD_RES_PASSTHRU;
 }