Route WALLOPS like a regular command, remove OnWallops hook

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 83c8c5bb3cc8d7726525c8a6a0475f2cc7b74040..4bcc2d9b2bae7690faa783032c747ef0e5bcac47 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -23,10 +23,7 @@
 #include "commands.h"
 
 #include "utils.h"
-#include "link.h"
-#include "treesocket.h"
 #include "treeserver.h"
-#include "resolvers.h"
 
 CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 {
@@ -65,7 +62,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                 * Nick collision.
                 */
                int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
-               ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
+               ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
                if (collide != 1)
                {
@@ -103,10 +100,12 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
        unsigned int paramptr = 9;
 
-       // Accept more '+' chars, for now
-       std::string::size_type pos = modestr.find_first_not_of('+');
-       for (std::string::const_iterator v = modestr.begin()+pos; v != modestr.end(); ++v)
+       for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v)
        {
+               // Accept more '+' chars, for now
+               if (*v == '+')
+                       continue;
+
                /* For each mode thats set, find the mode handler and set it on the new user */
                ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
                if (!mh)