Clean up duplicated link snomask messages on errors

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

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 0328ad40b22d62af8b6252d2048b1e1aa1d0c5cb..4dd05b101fabe3ecd67f53f035416966a265161c 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -22,30 +22,17 @@
 
 
 /** FMODE command - server mode with timestamp checks */
-bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
+void TreeSocket::ForceMode(User* who, parameterlist &params)
 {
        /* Chances are this is a 1.0 FMODE without TS */
        if (params.size() < 3)
        {
                /* No modes were in the command, probably a channel with no modes set on it */
-               return true;
+               return;
        }
 
-       std::string sourceserv;
+       std::string sourceserv = who->server;
 
-       /* Are we dealing with an FMODE from a user, or from a server? */
-       User* who = this->ServerInstance->FindNick(source);
-       if (who)
-       {
-               /* FMODE from a user, set sourceserv to the users server name */
-               sourceserv = who->server;
-       }
-       else
-       {
-               /* FMODE from a server, use a fake user to receive mode feedback */
-               who = Utils->ServerUser;
-               sourceserv = source;    /* Set sourceserv to the actual source string */
-       }
        std::vector<std::string> modelist;
        time_t TS = 0;
        for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
@@ -66,7 +53,7 @@ bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
 
        }
        /* Extract the TS value of the object, either User or Channel */
-       User* dst = this->ServerInstance->FindNick(params[0]);
+       User* dst = ServerInstance->FindNick(params[0]);
        Channel* chan = NULL;
        time_t ourTS = 0;
 
@@ -76,35 +63,34 @@ bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
        }
        else
        {
-               chan = this->ServerInstance->FindChan(params[0]);
+               chan = ServerInstance->FindChan(params[0]);
                if (chan)
                {
                        ourTS = chan->age;
                }
                else
                        /* Oops, channel doesnt exist! */
-                       return true;
+                       return;
        }
 
        if (!TS)
        {
                ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
                ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
-               return true;
+               return;
        }
 
        /* TS is equal or less: Merge the mode changes into ours and pass on.
         */
        if (TS <= ourTS)
        {
-               ServerInstance->Modes->Process(modelist, who, (who == Utils->ServerUser), true);
+               ServerInstance->Modes->Process(modelist, who, IS_SERVER(who));
 
                /* HOT POTATO! PASS IT ON! */
-               Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv);
+               Utils->DoOneToAllButSender(sourceserv,"FMODE",params,sourceserv);
        }
        /* If the TS is greater than ours, we drop the mode and dont pass it anywhere.
         */
-       return true;
 }