X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;ds=sidebyside;f=Uplink%2FUplink.class.php;h=345ceb8312c25131cc1c0d1f0fd3919ac733767c;hb=051ecddb99aba9afbfc8a09193e7dc13d823b9d3;hp=a5cc2eb74e710831bd2cc1d0d6e8a59cca400d11;hpb=e600821cfb2379771499f3bad6cf427e40af01a7;p=PHP-P10.git

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index a5cc2eb..345ceb8 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,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) {
@@ -521,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) {
@@ -538,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") {
@@ -560,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) {
@@ -577,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") {
@@ -687,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;
 		}
@@ -697,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]);