don't trigger mode event if mode change is coming from a server

[PHP-P10.git] / Uplink / Uplink.class.php

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 5e1e1ee827826973ff0db0f7fb8e2a5d5f11dce0..345ceb8312c25131cc1c0d1f0fd3919ac733767c 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -407,13 +407,16 @@ class Uplink {
        private function recv_burst($from, $args) {
                $name = $args[0];
                $create_time = $args[1];
+        if(count($args) == 2) {
+            //we've got an empty channel without any modes set???  dead channel!
+            return;
+        }
                $channel = P10_Channel::getChannelByName($name);
                if($channel == null)
                        $channel = new P10_Channel($name);
                $channel->setCreateTime($create_time);
                $modes = $channel->getModes();
                $userstr = $args[count($args)-1];
-               $modeparamcount = count($args)-3;
                if($userstr[0] == "%") {
                        //ban list
                        $banlist = explode(" ", substr($userstr, 1));
@@ -421,10 +424,8 @@ class Uplink {
                                //TODO: save bans
                        }
                        $userstr = $args[count($args)-2];
-                       $modeparamcount--;
                }
                if($userstr[0] == "+") { //MODE String
-                       $modeparamcount++;
                        $userstr = "";
                }
                $users = explode(",",$userstr);
@@ -433,8 +434,8 @@ class Uplink {
                        if($user == "") continue;
                        $uexp = explode(":", $user);
                        if(strlen($uexp[0]) != 5) {
-                               trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_ERROR);
-                               return;
+                               trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_WARNING);
+                               break;
                        }
                        if(count($uexp) > 1) {
                                $isop = false;
@@ -453,7 +454,9 @@ class Uplink {
                        if($this->eventHandler)
                                $this->eventHandler->event_join($user, $channel, true);
                }
-               $modes->parseModes(implode(" ", array_slice($args, 2, $modeparamcount)));
+               $modestr = array_slice($args, 2);
+               if($modestr[0] == "+")
+                       $modes->parseModes(implode(" ", $modestr));
        }
        
        private function recv_join($from, $args) {
@@ -517,7 +520,7 @@ class Uplink {
        private function recv_privmsg($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
-                       trigger_error("Server tries to send a privmsg from an user that does not exist or was not found on recv_privmsg.", E_USER_ERROR);
+                       trigger_error("Server tries to send a privmsg from an user that does not exist or was not found on recv_privmsg.", E_USER_WARNING);
                        return;
                }
                if($this->eventHandler) {
@@ -534,10 +537,13 @@ class Uplink {
                                        $this->eventHandler->event_chanctcp($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
                                } else
                                        $this->eventHandler->event_chanmessage($user, $channel, $args[1]);
+                       } else if($args[0][0] == "$") {
+                               //"multicast"
+                               $this->eventHandler->event_privmessage($user, NULL, $args[1]);
                        } else {
                                $targetUser = P10_User::getUserByNum($args[0]);
                                if($targetUser == null) {
-                                       trigger_error("Server tries to send a privmsg to an user that does not exist or was not found on recv_privmsg.", E_USER_ERROR);
+                                       trigger_error("Server tries to send a privmsg to an user that does not exist or was not found on recv_privmsg.", E_USER_WARNING);
                                        return;
                                }
                                if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
@@ -556,7 +562,7 @@ class Uplink {
        private function recv_notice($from, $args) {
                $user = P10_User::getUserByNum($from);
                if($user == null) {
-                       trigger_error("Server tries to send a notice from an user that does not exist or was not found on recv_notice.", E_USER_ERROR);
+                       trigger_error("Server tries to send a notice from an user that does not exist or was not found on recv_notice.", E_USER_WARNING);
                        return;
                }
                if($this->eventHandler) {
@@ -573,10 +579,13 @@ class Uplink {
                                        $this->eventHandler->event_chanctcpreply($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
                                } else
                                        $this->eventHandler->event_channotice($user, $channel, $args[1]);
+                       } else if($args[0][0] == "$") {
+                               //"multicast"
+                               $this->eventHandler->event_privnotice($user, NULL, $args[1]);
                        } else {
                                $targetUser = P10_User::getUserByNum($args[0]);
                                if($targetUser == null) {
-                                       trigger_error("Server tries to send a notice to an user that does not exist or was not found on recv_notice.", E_USER_ERROR);
+                                       trigger_error("Server tries to send a notice to an user that does not exist or was not found on recv_notice.", E_USER_WARNING);
                                        return;
                                }
                                if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
@@ -683,7 +692,7 @@ class Uplink {
        
        private function recv_mode($from, $args) {
                $user = P10_User::getUserByNum($from);
-               if($user == null) {
+               if($user == null && strlen($from) != 2) {
                        trigger_error("Server tries to send a modechange from an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
                        return;
                }
@@ -693,7 +702,7 @@ class Uplink {
                        if($channel == null)
                                $channel = new P10_Channel($args[0]);
                        $channel->getModes()->setModes($modes);
-                       if($this->eventHandler)
+                       if($this->eventHandler && strlen($from) != 2)
                                $this->eventHandler->event_chanmode($user, $channel, $modes);
                } else {
                        $targetUser = P10_User::getUserByNick($args[0]);