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 / fmode.cpp

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index a6fbab1649bd4db70329c212e0163a172ec32a3c..2ab37017079131d6d257453c9664df87418760fa 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -33,6 +33,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 
        bool smode = false;
        std::string sourceserv;
+
        /* Are we dealing with an FMODE from a user, or from a server? */
        User* who = this->Instance->FindNick(source);
        if (who)
@@ -44,13 +45,11 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
        {
                /* FMODE from a server, use a fake user to receive mode feedback */
                who = this->Instance->FakeClient;
-               smode = true;      /* Setting this flag tells us we should free the User later */
+               smode = true;                   /* Setting this flag tells us it is a server mode*/
                sourceserv = source;    /* Set sourceserv to the actual source string */
        }
-       const char* modelist[64];
+       std::vector<std::string> modelist;
        time_t TS = 0;
-       int n = 0;
-       memset(&modelist,0,sizeof(modelist));
        for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
        {
                if (q == 1)
@@ -64,7 +63,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
                else
                {
                        /* Everything else is fine to append to the modelist */
-                       modelist[n++] = params[q].c_str();
+                       modelist.push_back(params[q]);
                }
 
        }
@@ -72,6 +71,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
        User* dst = this->Instance->FindNick(params[0]);
        Channel* chan = NULL;
        time_t ourTS = 0;
+
        if (dst)
        {
                ourTS = dst->age;
@@ -90,7 +90,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 
        if (!TS)
        {
-               Instance->Log(DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
+               Instance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
                Instance->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;
        }
@@ -99,16 +99,13 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
         */
        if (TS <= ourTS)
        {
-               if ((TS < ourTS) && (!dst))
-                       Instance->Log(DEFAULT,"*** BUG *** Channel TS sent in FMODE to %s is %lu which is not equal to %lu!", params[0].c_str(), TS, ourTS);
-
                if (smode)
                {
-                       this->Instance->SendMode(modelist, n, who);
+                       this->Instance->SendMode(modelist, who);
                }
                else
                {
-                       this->Instance->CallCommandHandler("MODE", modelist, n, who);
+                       this->Instance->CallCommandHandler("MODE", modelist, who);
                }
                /* HOT POTATO! PASS IT ON! */
                Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv);