Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

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

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 630aab946727e7a01e739c7b145361b80c1c42f3..b891443ea1d1404a0606f83d1c2e3afe3c83e989 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -60,7 +60,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
        if (params.size() < 3)
                return true;
 
-       irc::modestacker modestack(true);                               /* Modes to apply from the users in the user list */
+       irc::modestacker modestack(Instance, true);                     /* Modes to apply from the users in the user list */
        User* who = NULL;                                               /* User we are currently checking */
        std::string channel = params[0];                                /* Channel name, as a string */
        time_t TS = atoi(params[1].c_str());                            /* Timestamp given to us for remote side */
@@ -73,7 +73,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 
        if (params.size() > 3)
                params[params.size() - 1] = ":" + params[params.size() - 1];
-               
+
        Utils->DoOneToAllButSender(source,"FJOIN",params,source);
 
        if (!TS)
@@ -95,7 +95,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
        {
                std::deque<std::string> param_list;
                if (Utils->AnnounceTSChange && chan)
-                       chan->WriteChannelWithServ(Instance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name, chan->name, (unsigned long) ourTS, (unsigned long) TS);
+                       chan->WriteChannelWithServ(Instance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), chan->name.c_str(), (unsigned long) ourTS, (unsigned long) TS);
                ourTS = TS;
                if (!created)
                {
@@ -151,7 +151,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 
                        /* Advance past the comma, to the nick */
                        usr++;
-                       
+
                        /* Check the user actually exists */
                        who = this->Instance->FindUUID(usr);
                        if (who)
@@ -206,7 +206,7 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string>
 
        if (c)
        {
-               irc::modestacker stack(false);
+               irc::modestacker stack(Instance, false);
                std::deque<std::string> stackresult;
                std::vector<std::string> mode_junk;
                mode_junk.push_back(c->name);
@@ -233,4 +233,4 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string>
        }
        return true;
 }
- 
+