fixed possible empty channel bursts

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index e2c2c03cbef4ddb3c538c26682cccfcbc8bb049b..5f2cdf1658237ca75adbdb6af51c04515cc9dc82 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -417,7 +417,6 @@ class Uplink {
                $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));
@@ -425,10 +424,8 @@ class Uplink {
                                //TODO: save bans
                        }
                        $userstr = $args[count($args)-2];
-                       $modeparamcount--;
                }
                if($userstr[0] == "+") { //MODE String
-                       $modeparamcount++;
                        $userstr = "";
                }
                $users = explode(",",$userstr);
@@ -437,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;
@@ -457,7 +454,7 @@ class Uplink {
                        if($this->eventHandler)
                                $this->eventHandler->event_join($user, $channel, true);
                }
-               $modes->parseModes(implode(" ", array_slice($args, 2, $modeparamcount)));
+               $modes->parseModes(implode(" ", array_slice($args, 2)));
        }
        
        private function recv_join($from, $args) {