added saxdb & continued BotLoader

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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 037d4633170c904026ee89f5f144e87294f52c94..d7d40fa86b3e4100ee10a4a42f4bf4907e111c89 100644 (file)
--- 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);