This should probably be tested, but makes a whole lot more sense like this (users...

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 056df2cc513df2f35cc443d85ced2b1ddb0ae502..c99402af07b1ca8b1a8f7c28f26c7189b8649b1e 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -361,6 +361,17 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                return this->Admin(prefix, params);
                        }
+                       else if (command == "MAP")
+                       {
+                               User* user = Instance->FindNick(prefix);
+                               if (user)
+                               {
+                                       const char* ptrs[127];
+                                       for (size_t n = 0; (n < params.size()) && (n < 127); ++n)
+                                               ptrs[n] = params[n].c_str();
+                                       return Utils->Creator->HandleMap(ptrs, params.size(), user);
+                               }
+                       }
                        else if (command == "SERVER")
                        {
                                return this->RemoteServer(prefix,params);
@@ -441,11 +452,12 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                if (params.size() == 3)
                                {
+                                       TreeServer* pf = Utils->FindServer(prefix);
                                        User* user = this->Instance->FindNick(params[1]);
                                        Channel* chan = this->Instance->FindChan(params[0]);
-                                       if (user && chan)
+                                       if (pf && user && chan)
                                        {
-                                               if (!chan->ServerKickUser(user, params[2].c_str(), false))
+                                               if (!chan->ServerKickUser(user, params[2].c_str(), false, pf->GetName().c_str()))
                                                        /* Yikes, the channels gone! */
                                                        delete chan;
                                        }
@@ -472,14 +484,15 @@ bool TreeSocket::ProcessLine(std::string &line)
                        else if (command == "OPERNOTICE")
                        {
                                if (params.size() >= 1)
-                                       Instance->SNO->WriteToSnoMask('A', "From " + prefix + ": " + params[0]);
+                                       Instance->SNO->WriteToSnoMask('A', "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": " + params[0]);
                                return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                        }
                        else if (command == "MODENOTICE")
                        {
                                if (params.size() >= 2)
                                {
-                                       Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", prefix.c_str(), params[1].c_str());
+                                       if (ServerSource)
+                                               Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()), params[1].c_str());
                                }
                                return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                        }
@@ -487,7 +500,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                if (params.size() >= 2)
                                {
-                                       Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + prefix + ": "+ params[1]);
+                                       Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
                                }
                                return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                        }
@@ -496,7 +509,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                                // Set prefix server as bursting
                                if (!ServerSource)
                                {
-                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", prefix.c_str());
+                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
                                        return false;
                                }
                                
@@ -507,7 +520,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                if (!ServerSource)
                                {
-                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", prefix.c_str());
+                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
                                        return false;
                                }
                                
@@ -516,7 +529,6 @@ bool TreeSocket::ProcessLine(std::string &line)
                        }
                        else if (command == "ENCAP")
                        {
-                               ServerSource->FinishBurst();
                                return this->Encap(prefix, params);
                        }
                        else if (command == "MODE")
@@ -531,7 +543,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                                {
                                        if (Instance->FindChan(params[0]))
                                        {
-                                               this->SendError("Protocol violation by '"+prefix+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
+                                               this->SendError("Protocol violation by '"+(ServerSource ? ServerSource->GetName().c_str() : prefix)+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
                                                return false;
                                        }
                                }