Fixed invite bugs

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a6cd9813986d2a9dc1f8609b54f0e2319cb1be7c..c1eac632fa38b555ab6378080febabf97092c385 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2625,11 +2625,8 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                {
                                                        if (strcmp(servers[j]->name,ServerName))
                                                        {
-                                                               if (ChanAnyOnThisServer(chan,servers[j]->name))
-                                                               {
-                                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                                       log(DEBUG,"Sent M token");
-                                                               }
+                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                               log(DEBUG,"Sent M token");
                                                        }
                                                }
                                        }
@@ -2650,11 +2647,8 @@ void process_modes(char **parameters,userrec* user,chanrec *chan,int status, int
                                                {
                                                        if (strcmp(servers[j]->name,ServerName))
                                                        {
-                                                               if (ChanAnyOnThisServer(chan,servers[j]->name))
-                                                               {
-                                                                       me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
-                                                                       log(DEBUG,"Sent m token");
-                                                               }
+                                                               me[defaultRoute]->SendPacket(buffer,servers[j]->internal_addr,servers[j]->internal_port,MyKey);
+                                                               log(DEBUG,"Sent m token");
                                                        }
                                                }
                                        }
@@ -6065,7 +6059,7 @@ void handle_P(char token,char* params,serverrec* source,serverrec* reply, char*
 void handle_i(char token,char* params,serverrec* source,serverrec* reply, char* udp_host,int udp_port)
 {
        char* nick = strtok(params," ");
-       char* from = strtok(params," ");
+       char* from = strtok(NULL," ");
        char* channel = strtok(NULL," ");
        userrec* u = Find(nick);
        userrec* user = Find(from);