From: pk910 <philipp@zoelle1.de>
Date: Tue, 16 Aug 2011 23:05:45 +0000 (+0200)
Subject: fixed possible empty channel bursts
X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=commitdiff_plain;h=bcb9933a3e3c463a412e00daeeee8b317e166d50

fixed possible empty channel bursts
---

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index e2c2c03..5f2cdf1 100644
--- 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) {