some more bug fixes (linkable version now)

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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 0095445030321de298caf5bafc0a64d26ef4689c..8174790753541f9af06c7843dcfb016072766434 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -55,7 +55,7 @@ require_once("P10_User.class.php");
 require_once("P10_ModeSets.class.php");
 
 class Uplink {
-       private $client = new Client();
+       private $client;
        private $settings = array();
        private $server;
        
@@ -66,7 +66,8 @@ class Uplink {
        private $flags = 0;
        
        public function __construct() {
-               $this->setSettings("recv_timeout", 1000);
+               $this->client = new Client();
+               $this->setSetting("recv_timeout", 1000);
        }
        
        public function initialize() {
@@ -104,7 +105,7 @@ class Uplink {
                        if(($this->flags & self::FLAG_SECURITY_QUIT) || ($this->flags & self::FLAG_NOT_CONNECTABLE)) {
                                sleep(1);
                        }
-                       $state = $this->client->connect($host, $port, $this->getSettings("bind"), $this->getSettings("ssl"), $this->getSettings("recv_timeout"));
+                       $state = $this->client->connect($host, $port, $this->getSetting("bind"), $this->getSetting("ssl"), $this->getSetting("recv_timeout"));
                        if(!$state) {
                                usleep($this->getSetting("recv_timeout") / 1000);
                                $this->flags |= self::FLAG_NOT_CONNECTABLE;
@@ -121,7 +122,7 @@ class Uplink {
                }
        }
        
-       public function setUplink($host, $port, $ssl = false, $bind = null) {
+       public function setUplinkHost($host, $port, $ssl = false, $bind = null) {
                $this->setSetting("host", $host);
                $this->setSetting("port", $port);
                $this->setSetting("ssl", $ssl);
@@ -252,7 +253,7 @@ class Uplink {
                                return;
                        }
                        $new_server = new P10_Server($args[0], substr($args[5],0,2), $this->server, $args[2], $args[3], $args[7]);
-                       $this->server->add_server($new_server);
+                       $this->server->addServer($new_server);
                        $this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
                } else {
                        //another server got a new slave server ^^
@@ -262,7 +263,7 @@ class Uplink {
                                return;
                        }
                        $new_server = new P10_Server($args[0], substr($args[5],0,2), $server, $args[2], $args[3], $args[7]);
-                       $server->add_server($new_server);
+                       $server->addServer($new_server);
                }
        }
        
@@ -295,7 +296,7 @@ class Uplink {
                        $ident = $args[3];
                        $host = $args[4];
                        $modes = implode(" ",array_slice($args, 5, count($args)-8));
-                       $modes = new UserModeSet($modes);
+                       $modes = new P10_UserModeSet($modes);
                        $ip = Numerics::parseIP($args[count($args)-3]);
                        $realname = $args[count($args)-1];
                        new P10_User($nick, $numeric, $server, $connect_time, $ident, $host, $ip, $realname, $modes);