Fix a lot of calls to match() and uses of wildcard.h (which doesn't exist anymore...

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

diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index 15488e71cf93e4dbe24699ee091c9757cb95bdff..25af17620c55fbd4eb50ffd4f982c3a729beb9c1 100644 (file)
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -2,56 +2,50 @@
  *       | 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
- *          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 "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 */
 
-int ModuleSpanningTree::HandleRemoteWhois(const char** parameters, int pcnt, userrec* user)
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+
+int ModuleSpanningTree::HandleRemoteWhois(const std::vector<std::string>& parameters, User* user)
 {
-        if ((IS_LOCAL(user)) && (pcnt > 1))
-        {
-                userrec* remote = ServerInstance->FindNick(parameters[1]);
-                if ((remote) && (remote->GetFd() < 0))
-                {
-                        std::deque<std::string> params;
-                        params.push_back(parameters[1]);
-                        Utils->DoOneToOne(user->uuid,"IDLE",params,remote->server);
-                        return 1;
-                }
-                else if (!remote)
-                {
-                        user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
-                        user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
-                        return 1;
-                }
-        }
-        return 0;
+       if ((IS_LOCAL(user)) && (parameters.size() > 1))
+       {
+               User* remote = ServerInstance->FindNick(parameters[1]);
+               if ((remote) && (remote->GetFd() < 0))
+               {
+                       std::deque<std::string> params;
+                       params.push_back(remote->uuid);
+                       Utils->DoOneToOne(user->uuid,"IDLE",params,remote->server);
+                       return 1;
+               }
+               else if (!remote)
+               {
+                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
+                       user->WriteNumeric(318, "%s %s :End of /WHOIS list.",user->nick.c_str(), parameters[1].c_str());
+                       return 1;
+               }
+       }
+       return 0;
 }