X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=d7d40fa86b3e4100ee10a4a42f4bf4907e111c89;hb=412e324075de1312fbc5f49b735180b46cdff82c;hp=7f0e0af661225ec233468b11bf35f8b4f0c0e0cd;hpb=b692377ffd5176e4be4394997c149773eb9405f7;p=PHP-P10.git

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 7f0e0af..d7d40fa 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -330,7 +330,7 @@ class Uplink {
 			$this->server->addServer($new_server);
 			$this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
 			if($this->eventHandler)
-				$this->eventHandler->event_server($new_server, !($this->flags & self::FLAG_CONNECTED));
+				$this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
 		} else {
 			//another server got a new slave server ^^
 			$server = P10_Server::getServerByNum($from);
@@ -341,7 +341,7 @@ class Uplink {
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $server, $args[2], $args[3], $args[7]);
 			$server->addServer($new_server);
 			if($this->eventHandler)
-				$this->eventHandler->event_server($new_server, !($this->flags & self::FLAG_CONNECTED));
+				$this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
 		}
 	}
 	
@@ -443,6 +443,7 @@ class Uplink {
 		$users = explode(",",$userstr);
 		$isop = false; $isvoice = false;
 		foreach($users as $user) {
+			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);
@@ -605,10 +606,10 @@ class Uplink {
 					$cmodes = $channel->getModes();
 					$privs = $channel->getUserPrivs($user);
 					if($cmodes->hasMode("s") && !$fromUser->isOnChannel($channel) && $from != $user->getNumeric()) continue;
-					if($cmodes->hasMode("u") && ($privs & (P10_Channel::USERPRIV_OPPED | P10_Channel::USERPRIV_VOICE)) == 0 && $from != $user->getNumeric()) continue;
+					if($cmodes->hasMode("u") && ($privs & (P10_Channel::USERPRIV_OPED | P10_Channel::USERPRIV_VOICE)) == 0 && $from != $user->getNumeric()) continue;
 					$chanstr = ($channels == "" ? "" : " ");
 					$prefix = "";
-					if(($privs & P10_Channel::USERPRIV_OPPED)) {
+					if(($privs & P10_Channel::USERPRIV_OPED)) {
 						$prefix = "@";
 					} else if(($privs & P10_Channel::USERPRIV_VOICE)) {
 						$prefix = "+";