Added TOPIC handler stub

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 6a2c45ec2568a7736acf1572bce37a677b26513a..63f9a487f8484e28922b18815b861399490c5ec1 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -434,7 +434,6 @@ class TreeSocket : public InspSocket
 
        bool ForceMode(std::string source, std::deque<std::string> params)
        {
-               log(DEBUG,"*** FORCEMODE");
                userrec* who = new userrec;
                who->fd = FD_MAGIC_NUMBER;
                if (params.size() < 2)
@@ -446,7 +445,6 @@ class TreeSocket : public InspSocket
                }
                Srv->SendMode(modelist,params.size(),who);
                DoOneToAllButSender(source,"FMODE",params,source);
-               log(DEBUG,"***** Duplicated");
                delete who;
                return true;
        }
@@ -548,6 +546,7 @@ class TreeSocket : public InspSocket
                        clientlist[tempnick]->chans[i].channel = NULL;
                        clientlist[tempnick]->chans[i].uc_modes = 0;
                }
+               params[7] = ":" + params[7];
                DoOneToAllButSender(source,"NICK",params,source);
                return true;
        }
@@ -671,6 +670,28 @@ class TreeSocket : public InspSocket
                return true;
        }
 
+       bool RemoteKill(std::string prefix, std::deque<std::string> params)
+       {
+               if (params.size() != 2)
+                       return true;
+               std::string nick = params[0];
+               std::string reason = params[1];
+               userrec* u = Srv->FindNick(prefix);
+               userrec* who = Srv->FindNick(nick);
+               if (who)
+               {
+                       std::string sourceserv = prefix;
+                       if (u)
+                       {
+                               sourceserv = u->server;
+                       }
+                       params[1] = ":" + params[1];
+                       DoOneToAllButSender(prefix,"KILL",params,sourceserv);
+                       Srv->QuitUser(who,reason);
+               }
+               return true;
+       }
+
        bool RemoteServer(std::string prefix, std::deque<std::string> params)
        {
                if (params.size() < 4)
@@ -725,6 +746,7 @@ class TreeSocket : public InspSocket
                                // node.
                                TreeServer* Node = new TreeServer(servername,description,TreeRoot,this);
                                TreeRoot->AddChild(Node);
+                               params[3] = ":" + params[3];
                                DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,servername);
                                this->DoBurst(Node);
                                return true;
@@ -776,30 +798,39 @@ class TreeSocket : public InspSocket
                while (!s.eof())
                {
                        s >> param;
-                       if ((param.c_str()[0] == ':') && (item))
+                       if ((param != "") && (param != "\n"))
                        {
-                               char* str = (char*)param.c_str();
-                               str++;
-                               param = str;
-                               std::string append;
-                               while (!s.eof())
+                               if ((param.c_str()[0] == ':') && (item))
                                {
-                                       append = "";
-                                       s >> append;
-                                       if (append != "")
+                                       char* str = (char*)param.c_str();
+                                       str++;
+                                       param = str;
+                                       std::string append;
+                                       while (!s.eof())
                                        {
-                                               param = param + " " + append;
+                                               append = "";
+                                               s >> append;
+                                               if (append != "")
+                                               {
+                                                       param = param + " " + append;
+                                               }
                                        }
                                }
+                               item++;
+                               n.push_back(param);
                        }
-                       item++;
-                       n.push_back(param);
                }
                return n;
        }
 
        bool ProcessLine(std::string line)
        {
+               char* l = (char*)line.c_str();
+               while ((strlen(l)) && (l[strlen(l)-1] == '\r') || (l[strlen(l)-1] == '\n'))
+                       l[strlen(l)-1] = '\0';
+               line = l;
+               if (line == "")
+                       return true;
                Srv->Log(DEBUG,"inbound-line: '"+line+"'");
                std::deque<std::string> params = this->Split(line,true);
                std::string command = "";
@@ -907,6 +938,10 @@ class TreeSocket : public InspSocket
                                {
                                        return this->ForceMode(prefix,params);
                                }
+                               else if (command == "KILL")
+                               {
+                                       return this->RemoteKill(prefix,params);
+                               }
                                else if (command == "SQUIT")
                                {
                                        if (params.size() == 2)
@@ -981,10 +1016,6 @@ class TreeSocket : public InspSocket
                TreeServer* s = FindServer(quitserver);
                if (s)
                {
-                       std::deque<std::string> params;
-                       params.push_back(quitserver);
-                       params.push_back(":Remote host closed the connection");
-                       DoOneToAllButSender(Srv->GetServerName(),"SQUIT",params,quitserver);
                        Squit(s,"Remote host closed the connection");
                }
        }
@@ -1300,6 +1331,21 @@ class ModuleSpanningTree : public Module
                return 0;
        }
 
+       virtual void OnUserInvite(userrec* source,userrec* dest,chanrec* channel)
+       {
+               if (std::string(source->server) == Srv->GetServerName())
+               {
+                       std::deque<std::string> params;
+                       params.push_back(dest->nick);
+                       params.push_back(channel->name);
+                       DoOneToMany(source->nick,"INVITE",params);
+               }
+       }
+
+       virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, std::string topic)
+       {
+       }
+
        virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text)
        {
                if (target_type == TYPE_USER)
@@ -1430,6 +1476,27 @@ class ModuleSpanningTree : public Module
                }
        }
 
+       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+       {
+               if (std::string(source->server) == Srv->GetServerName())
+               {
+                       log(DEBUG,"**** User on %s KICKs: %s %s",source->server,source->nick,user->nick);
+                       std::deque<std::string> params;
+                       params.push_back(chan->name);
+                       params.push_back(user->nick);
+                       params.push_back(":"+reason);
+                       DoOneToMany(source->nick,"KICK",params);
+               }
+       }
+
+       virtual void OnRemoteKill(userrec* source, userrec* dest, std::string reason)
+       {
+               std::deque<std::string> params;
+               params.push_back(dest->nick);
+               params.push_back(":"+reason);
+               DoOneToMany(source->nick,"KILL",params);
+       }
+
        // note: the protocol does not allow direct umode +o except
        // via NICK with 8 params. sending OPERTYPE infers +o modechange
        // locally.